6502/millfork
1
0
Fork 0
mirror of https://github.com/KarolS/millfork.git synced 2025-04-04 22:29:32 +00:00
Code Issues Projects Releases Wiki Activity

6502: Allow assigning between two statically allocated pointers; fixes #25

Browse Source
This commit is contained in:
Karol Stasiak 2019-12-30 14:28:37 +01:00
parent 709d3d0fcd
commit 69c82d90a8
2 changed files with 44 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/scala/millfork/compiler/mos/MosExpressionCompiler.scala
View File

@ -2238,9 +2238,22 @@ object MosExpressionCompiler extends AbstractExpressionCompiler[AssemblyLine] {
AssemblyLine.indexedY(STA, reg, 2))
}
}
case _ => ???
case (MemoryAddressConstant(thT: MemoryVariable), MemoryAddressConstant(thS: MemoryVariable)) if thT.name != thS.name =>
prepare ++ prepareSource ++ (0 until targetType.size).flatMap { i =>
if (i >= sourceType.size) List(
if (i == 0) AssemblyLine.immediate(LDY, sourceOffset) else AssemblyLine.implied(INY),
AssemblyLine.immediate(LDA, 0),
AssemblyLine.indexedY(STA, thT))
else List(
if (i == 0) AssemblyLine.immediate(LDY, sourceOffset) else AssemblyLine.implied(INY),
AssemblyLine.indexedY(LDA, thS),
AssemblyLine.indexedY(STA, thT))
}
case _ =>
???
}
case _ => ???
case _ =>
???
}
case _ =>
(targetType.size, am) match {

29
src/test/scala/millfork/test/ForLoopSuite.scala
View File

@ -478,4 +478,33 @@ class ForLoopSuite extends FunSuite with Matchers {
|}
""".stripMargin).readByte(0xc000) should equal(45)
}
test("Some pointers in loops") {
val code =
"""
|struct Sprite {
| byte y
|}
|
|array(Sprite) sprites [20]
|Sprite test
|
|void main() {
| byte i
| test = Sprite(1)
| pointer.Sprite test_pointer
| test_pointer = test.pointer
|
| sprites[0] = Sprite(5)
| pointer.Sprite current_sprite
| current_sprite = pointer.Sprite(sprites.pointer)
| for i,0,until,20 {
| current_sprite->y = test_pointer->y
| }
|}
|""".stripMargin
EmuUnoptimizedCrossPlatformRun(Cpu.Mos, Cpu.Z80, Cpu.Motorola6809) (code) { m =>
// OK
}
}
}