mirror of
https://github.com/KarolS/millfork.git
synced 2024-05-31 18:41:30 +00:00
fix z80 indexing in hardwritten assembly (#137)
This commit is contained in:
parent
24de2f7530
commit
ee47ccef5a
|
@ -241,7 +241,7 @@ object Z80StatementCompiler extends AbstractStatementCompiler[ZLine] {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
val registers = (reg, offset) match {
|
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(NumericConstant(v, _)) => OneRegisterOffset(r, v.toInt)
|
||||||
case Some(_) =>
|
case Some(_) =>
|
||||||
ctx.log.error("Non-numeric constant", o.position)
|
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)
|
ctx.log.error("Inlining failed due to non-constant things", o.position)
|
||||||
reg
|
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(NumericConstant(v, _)) => TwoRegistersOffset(t, s, v.toInt)
|
||||||
case Some(_) =>
|
case Some(_) =>
|
||||||
ctx.log.error("Non-numeric constant", o.position)
|
ctx.log.error("Non-numeric constant", o.position)
|
||||||
|
|
|
@ -728,9 +728,9 @@ class Z80AssemblySuite extends FunSuite with Matchers {
|
||||||
"""
|
"""
|
||||||
| asm void main () {
|
| asm void main () {
|
||||||
| ret
|
| ret
|
||||||
| add a,ix(0)
|
| add a,ix(1)
|
||||||
| adc a,ix(0)
|
| adc a,ix(2)
|
||||||
| sub ix(0)
|
| sub ix(3)
|
||||||
| sbc a,ix(0)
|
| sbc a,ix(0)
|
||||||
| and ix(0)
|
| and ix(0)
|
||||||
| xor ix(0)
|
| xor ix(0)
|
||||||
|
@ -760,8 +760,8 @@ class Z80AssemblySuite extends FunSuite with Matchers {
|
||||||
| ex (sp),ix
|
| ex (sp),ix
|
||||||
| jp (ix)
|
| jp (ix)
|
||||||
| ld sp,ix
|
| ld sp,ix
|
||||||
| ld a,ix(0)
|
| ld a,ix(2)
|
||||||
| ld ix(0),a
|
| ld ix(2),a
|
||||||
|
|
|
|
||||||
| ret
|
| ret
|
||||||
| }
|
| }
|
||||||
|
@ -773,9 +773,9 @@ class Z80AssemblySuite extends FunSuite with Matchers {
|
||||||
"""
|
"""
|
||||||
| asm void main () {
|
| asm void main () {
|
||||||
| ret
|
| ret
|
||||||
| add a,iy(0)
|
| add a,iy(1)
|
||||||
| adc a,iy(0)
|
| adc a,iy(2)
|
||||||
| sub iy(0)
|
| sub iy(3)
|
||||||
| sbc a,iy(0)
|
| sbc a,iy(0)
|
||||||
| and iy(0)
|
| and iy(0)
|
||||||
| xor iy(0)
|
| xor iy(0)
|
||||||
|
@ -805,8 +805,8 @@ class Z80AssemblySuite extends FunSuite with Matchers {
|
||||||
| ex (sp),iy
|
| ex (sp),iy
|
||||||
| jp (iy)
|
| jp (iy)
|
||||||
| ld sp,iy
|
| ld sp,iy
|
||||||
| ld a,iy(0)
|
| ld a,iy(2)
|
||||||
| ld iy(0),a
|
| ld iy(2),a
|
||||||
|
|
|
|
||||||
| ret
|
| ret
|
||||||
| }
|
| }
|
||||||
|
|
Loading…
Reference in New Issue
Block a user