fix various bugs around word-indexing combined with address-of: &buffer[2000]

compiler/test/ast/TestConst.kt

@@ -6,7 +6,6 @@ import io.kotest.matchers.shouldBe
 import io.kotest.matchers.shouldNotBe
 import io.kotest.matchers.string.shouldContain
 import io.kotest.matchers.types.instanceOf
-import prog8.ast.expressions.AddressOf
 import prog8.ast.expressions.BinaryExpression
 import prog8.ast.expressions.IdentifierReference
 import prog8.ast.expressions.NumericLiteral
@@ -261,16 +260,16 @@ main {
     }
 
     test("const address-of memory mapped arrays") {
-        val src="""
+        val src= """
 main {
     sub start() {
-        &uword[30] @nosplit wb = ${'$'}2000
-        &uword[100] @nosplit array1 = ${'$'}9e00
+        &uword[30] @nosplit wb = $2000
+        &uword[100] @nosplit array1 = $9e00
         &uword[30] @nosplit array2 = &array1[len(wb)]
 
-        cx16.r0 = &array1           ; ${'$'}9e00
-        cx16.r1 = &array1[len(wb)]  ; ${'$'}9e3c
-        cx16.r2 = &array2           ; ${'$'}9e3c
+        cx16.r0 = &array1           ; $9e00
+        cx16.r1 = &array1[len(wb)]  ; $9e3c
+        cx16.r2 = &array2           ; $9e3c
     }
 }"""
         val result = compileText(Cx16Target(), false, src, outputDir, writeAssembly = false)!!
@@ -307,10 +306,10 @@ main {
     }
 
     test("address of a const uword pointer array expression") {
-        val src="""
+        val src= """
 main {
     sub start() {
-        const uword buffer = ${'$'}2000
+        const uword buffer = 2000
         uword @shared addr = &buffer[2]
         
         const ubyte width = 100
@@ -323,10 +322,9 @@ main {
         val st = result.compilerAst.entrypoint.statements
         st.size shouldBe 11
         val assignAddr = (st[2] as Assignment).value
-        (assignAddr as NumericLiteral).number shouldBe 8194.0
-        val assignAddr2 = ((st[9] as Assignment).value as AddressOf)
-        assignAddr2.identifier.nameInSource shouldBe listOf("buffer")
-        assignAddr2.arrayIndex!!.indexExpr shouldBe instanceOf<BinaryExpression>()
+        (assignAddr as NumericLiteral).number shouldBe 2002.0
+        val assignAddr2 = (st[9] as Assignment).value as BinaryExpression
+        assignAddr2.operator shouldBe "+"
     }
 
     test("out of range const byte and word give correct error") {

compiler/test/ast/TestVariousCompilerAst.kt

@@ -1060,6 +1060,24 @@ main {
         st2[3].children.dropLast(1).map { (it as PtAssignTarget).identifier!!.name } shouldBe listOf("p8b_main.p8s_start.p8v_x", "p8b_main.p8s_start.p8v_y", "p8b_main.p8s_start.p8v_z")
         ((st2[3] as PtAssignment).value as PtFunctionCall).name shouldBe "p8b_main.p8s_multi"
     }
+
+    test("address-of a uword pointer with word index should not overflow") {
+        val src= """
+main {
+    sub start() {
+        const uword cbuffer = $2000
+        uword @shared buffer = $2000
+
+        cx16.r1 = &cbuffer[2000]
+        cx16.r5 = &buffer[2000]
+        
+        cx16.r3 = &cbuffer[cx16.r0]
+        cx16.r4 = &buffer[cx16.r0]
+    }
+}"""
+        compileText(Cx16Target(), optimize=false, src, outputDir, writeAssembly=true) shouldNotBe null
+        compileText(VMTarget(), optimize=false, src, outputDir, writeAssembly=true) shouldNotBe null
+    }
 }
 
 })

compiler/test/vm/TestCompilerVirtual.kt

@@ -532,4 +532,22 @@ main {
         instructions[10].type shouldBe IRDataType.WORD
     }
 
+    test("typed address-of a const pointer with non-const array indexing") {
+        val src= """
+main {
+    sub start() {
+        const uword cbuffer = $2000
+        uword @shared buffer = $2000
+
+        cx16.r2 = @(cbuffer + cx16.r0)
+        cx16.r1 = &cbuffer[cx16.r0]
+
+        cx16.r3 = @(buffer + cx16.r0)
+        cx16.r4 = &buffer[cx16.r0]     
+    }
+}"""
+        val result = compileText(VMTarget(), false, src, outputDir)!!
+        val virtfile = result.compilationOptions.outputDir.resolve(result.compilerAst.name + ".p8ir")
+        VmRunner().runProgram(virtfile.readText(), true)
+    }
 })