Apple-2-SW/prog8
1
0
Fork 0
mirror of https://github.com/irmen/prog8.git synced 2025-11-01 06:16:15 +00:00
Code Issues Projects Releases Wiki Activity

consolidate @rombank and @rambank into just @bank

Browse Source
This commit is contained in:
Irmen de Jong
2024-11-03 21:00:39 +01:00
parent cb47e2c149
commit 85e87dfe2e
22 changed files with 105 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
codeGenIntermediate/src/prog8/codegen/intermediate/ExpressionGen.kt
View File

@@ -645,10 +645,10 @@ internal class ExpressionGen(private val codeGen: IRCodeGen) {
IRInstruction(Opcode.CALL, labelSymbol = fcall.name, fcallArgs = FunctionCallArgs(argRegisters, returnRegs))
else {
val address = callTarget.address!!
if(address.rombank==null && address.rambank==null) {
if(address.first==null) {
IRInstruction(
Opcode.CALL,
address = address.address.toInt(),
address = address.second.toInt(),
fcallArgs = FunctionCallArgs(argRegisters, returnRegs))
}
else {
@@ -767,10 +767,10 @@ internal class ExpressionGen(private val codeGen: IRCodeGen) {
IRInstruction(Opcode.CALL, labelSymbol = fcall.name, fcallArgs = FunctionCallArgs(argRegisters, returnRegisters))
else {
val address = callTarget.address!!
if(address.rombank==null && address.rambank==null) {
if(address.first==null) {
IRInstruction(
Opcode.CALL,
address = address.address.toInt(),
address = address.second.toInt(),
fcallArgs = FunctionCallArgs(argRegisters, returnRegisters)
)
}

2
codeGenIntermediate/test/TestVmCodeGen.kt
View File

@@ -534,7 +534,7 @@ class TestVmCodeGen: FunSpec({
val codegen = VmCodeGen()
val program = PtProgram("test", DummyMemsizer, DummyStringEncoder)
val block = PtBlock("main", false, SourceCode.Generated("test"), PtBlock.Options(), Position.DUMMY)
val romsub = PtAsmSub("routine", PtAsmSub.Address(null, null, 0x5000u), setOf(CpuRegister.Y), emptyList(), emptyList(), false, Position.DUMMY)
val romsub = PtAsmSub("routine", null to 0x5000u, setOf(CpuRegister.Y), emptyList(), emptyList(), false, Position.DUMMY)
block.add(romsub)
val sub = PtSub("start", emptyList(), null, Position.DUMMY)
val call = PtFunctionCall("main.routine", true, DataType.UNDEFINED, Position.DUMMY)