6502
/
millfork
mirror of https://github.com/KarolS/millfork.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix z80 indexing in hardwritten assembly (#137)

This commit is contained in:
Karol Stasiak 2023-01-27 18:27:53 +01:00
parent 24de2f7530
commit ee47ccef5a
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/scala/millfork/compiler/z80/Z80StatementCompiler.scala
View File

@ -241,7 +241,7 @@ object Z80StatementCompiler extends AbstractStatementCompiler[ZLine] {
}
}
val registers = (reg, offset) match {
case (OneRegister(r), Some(o)) => env.evalForAsm(expression) match {
case (OneRegister(r), Some(o)) => env.evalForAsm(o) match {
case Some(NumericConstant(v, _)) => OneRegisterOffset(r, v.toInt)
case Some(_) =>
ctx.log.error("Non-numeric constant", o.position)
@ -250,7 +250,7 @@ object Z80StatementCompiler extends AbstractStatementCompiler[ZLine] {
ctx.log.error("Inlining failed due to non-constant things", o.position)
reg
}
case (TwoRegisters(t, s), Some(o)) => env.evalForAsm(expression) match {
case (TwoRegisters(t, s), Some(o)) => env.evalForAsm(o) match {
case Some(NumericConstant(v, _)) => TwoRegistersOffset(t, s, v.toInt)
case Some(_) =>
ctx.log.error("Non-numeric constant", o.position)

20
src/test/scala/millfork/test/Z80AssemblySuite.scala
View File

@ -728,9 +728,9 @@ class Z80AssemblySuite extends FunSuite with Matchers {
"""
| asm void main () {
| ret
| add a,ix(0)
| adc a,ix(0)
| sub ix(0)
| add a,ix(1)
| adc a,ix(2)
| sub ix(3)
| sbc a,ix(0)
| and ix(0)
| xor ix(0)
@ -760,8 +760,8 @@ class Z80AssemblySuite extends FunSuite with Matchers {
| ex (sp),ix
| jp (ix)
| ld sp,ix
| ld a,ix(0)
| ld ix(0),a
| ld a,ix(2)
| ld ix(2),a
|
| ret
| }
@ -773,9 +773,9 @@ class Z80AssemblySuite extends FunSuite with Matchers {
"""
| asm void main () {
| ret
| add a,iy(0)
| adc a,iy(0)
| sub iy(0)
| add a,iy(1)
| adc a,iy(2)
| sub iy(3)
| sbc a,iy(0)
| and iy(0)
| xor iy(0)
@ -805,8 +805,8 @@ class Z80AssemblySuite extends FunSuite with Matchers {
| ex (sp),iy
| jp (iy)
| ld sp,iy
| ld a,iy(0)
| ld iy(0),a
| ld a,iy(2)
| ld iy(2),a
|
| ret
| }