fix pc-relative operands when 24-bit addresses are used. change snes example to use 24-bit bank base addresses, and use fastrom + lorom (hirom is neat but complicates things a bit). add 'far' to sublime keywords

Author: Bananattack

examples/nes/shmup/main.wiz

@@ -43,6 +43,23 @@ in prg {
         // Wait for the second PPU vertical blank
         do {} while !nes.ppu.status$7;
 
+        // Read PPU status to reset the PPU high/low latch.
+        a = nes.ppu.status;
+        // Now setup the PPU for copying to the nametable.
+        nes.ppu.address = a = >:nes.ppu.ADDRESS_NAMETABLE_DATA;
+        nes.ppu.address = a = <:nes.ppu.ADDRESS_NAMETABLE_DATA;
+        // Clear the nametable.
+        x = >:nes.ppu.NAMETABLE_SIZE * 2;
+        do {
+            y = 0;
+            do {
+                nes.ppu.data = a;
+                y++;
+            } while !zero;
+
+            x--;
+        } while !zero;
+
         {
             y = 0;
             x = nes.ppu.PALETTE_SIZE * nes.ppu.PALETTE_COUNT;

examples/snes/hello/banks.wiz

@@ -1,4 +1,9 @@
+config {
+    map_mode = "lorom",
+    fastrom = true,
+}
+
 bank zeropage @ 0x00 : [vardata; 256];
 bank stack @ 0x100 : [vardata; 256];
-bank prg @ 0x8000 : [constdata; 0x8000];
+bank prg @ 0x808000 : [constdata; 0x8000];
 bank far_ram @ 0xFE8000 : [vardata; 0x8000];

examples/snes/hello/main.wiz

@@ -97,8 +97,6 @@ in prg {
         snes.dma.mdma_enable = a = snes.dma.ENABLE_0;
     }
 
-    far func bar() {}
-
     #[fallthrough] func main() {
         nointerrupt = true;
         decimal = false;
@@ -111,109 +109,101 @@ in prg {
 
             hardware_init();
 
-            /*a = *wow2;
-            *wow2 = a;
-            wow2[yy] = a;
-            a = wow2[yy];
-            while true {}
-            goto bar;
-            bar();
-            goto (far &main as far func);
-            goto wow3;
-            ^goto (&wow3 as func);
-            goto *(&wow3 as *func);
-            goto *((&wow3 as u16 + xx) as *func);
-            (*((&wow3 as u16 + xx) as *func))();
-            goto *(&wow4 as *far func);
-            goto wow4; // FIXME: should be equivalent to 'goto *(&wow4 as *far func);'
-*/
-
-            w0 = xx = &spc_main[0] as u16;
-            xx = 0x200;
-            yy = spc_main.len - 2;
-            snes2spc.transfer(xx, w0, yy);
-            xx = *(&spc_main[spc_main.len - 2] as *u16);
-            snes2spc.dispatch(xx);
-
-            snes.ppu.vram_control = a = snes.ppu.VRAM_CONTROL_INCREMENT_1 | snes.ppu.VRAM_CONTROL_SIZE_16;
-            snes.ppu.vram_address_hl = xx = 0;
-
-            snes.dma0.control = a = snes.dma.CONTROL_MODE_AB;
-            snes.dma0.mdma_dest = a = <:&snes.ppu.vram_write_data_l;
-            snes.dma0.src_address_hl = xx = &hello_tiles_chr as u16;
-            snes.dma0.src_address_bank = 0;
-            snes.dma0.mdma_size_hl = xx = sizeof(typeof(hello_tiles_chr)) / sizeof(u16);
-
-            snes.ppu.cgram_address = 0;
-
-            snes.dma1.control = a = snes.dma.CONTROL_MODE_A;
-            snes.dma1.mdma_dest = a = <:&snes.ppu.cgram_write_data;
-            snes.dma1.src_address_hl = xx = &bkg_palette_data as u16;
-            snes.dma1.src_address_bank = 0;
-            snes.dma1.mdma_size_hl = xx = sizeof(typeof(bkg_palette_data));
-
-            snes.dma.mdma_enable = a = snes.dma.ENABLE_0 | snes.dma.ENABLE_1;
-
-            let BG1_TILEMAP_BASE_ADDRESS = 0x1000;
-            let BG12_TILESET_BASE_ADDRESS = 0x0000;
-
-            let TEXT_X = 10;
-            let TEXT_Y = 13;
-            let TEXT_TILEMAP_DEST = BG1_TILEMAP_BASE_ADDRESS + TEXT_Y * 32 + TEXT_X;
-
-            snes.ppu.vram_control = a = snes.ppu.VRAM_CONTROL_INCREMENT_1 | snes.ppu.VRAM_CONTROL_SIZE_8;
-            snes.ppu.vram_address_hl = xx = TEXT_TILEMAP_DEST;
-
-            snes.dma0.control = a = snes.dma.CONTROL_MODE_A;
-            snes.dma0.mdma_dest = a = <:&snes.ppu.vram_write_data_l;
-            snes.dma0.src_address_hl = xx = &message as u16;
-            snes.dma0.src_address_bank = 0;
-            snes.dma0.mdma_size_hl = xx = sizeof(typeof(message));
-
-            snes.dma.mdma_enable = a = snes.dma.ENABLE_0;
-
-            snes.ppu.bg1_tilemap = a = BG1_TILEMAP_BASE_ADDRESS >> snes.ppu.BG_TILEMAP_ADDRESS_BIT_ALIGN << snes.ppu.BG_TILEMAP_ADDRESS_SHIFT_LEFT;
-            snes.ppu.bg12_tileset = a = BG12_TILESET_BASE_ADDRESS >> snes.ppu.BG_TILESET_ADDRESS_BIT_ALIGN;
-            snes.ppu.bg_mode = a = 2;
-            snes.ppu.screen_enable_mask = a = snes.ppu.SCREEN_ENABLE_BG1;
-            snes.ppu.brightness = a = 0xF;
-
-            mosaic = 0;
-
-            while true {
-                while !snes.ppu.hvbjoy_status $ snes.ppu.HVBJOY_STATUS_VBLANK_BIT {}
-
-                snes.ppu.mosaic = a = ((mosaic >>> 4) << 4) | 0x1;
-                mosaic = a = mosaic + 0x08;
-
-                a = timer;
-
-                mem16();
-                #[mem16] {
-                    aa &= 0xFF;
-                    yy = aa <<= 1;
-                }
-                mem8();
-
-                xx = *((&sine_table as u16 + yy) as *u16);
-                w0 = xx;
-
-                mem16();
-                #[mem16] {
-                    aa = w0;
-
-                    inline for in 1 .. 10 { cmp(aa, 0x8000); aa >>>>#= 1; }
-
-                    w0 = aa;
-                }
-                mem8();
-
-                snes.ppu.bg1_scroll_y = a = <:w0;
-                snes.ppu.bg1_scroll_y = a = >:w0;
-                ++timer;
- 
-                while snes.ppu.hvbjoy_status $ snes.ppu.HVBJOY_STATUS_VBLANK_BIT {}
+            snes.rom.speed = a = snes.rom.SPEED_FAST;
+
+            push(a = 0x80);
+            data_bank = pop(); 
+
+            return fast_main();
+        }
+    }
+
+    #[fallthrough, mem8, idx16] far func fast_main() {
+        w0 = xx = &spc_main[0] as u16;
+        xx = 0x200;
+        yy = spc_main.len - 2;
+        snes2spc.transfer(xx, w0, yy);
+        xx = *(&spc_main[spc_main.len - 2] as *u16);
+        snes2spc.dispatch(xx);
+
+        snes.ppu.vram_control = a = snes.ppu.VRAM_CONTROL_INCREMENT_1 | snes.ppu.VRAM_CONTROL_SIZE_16;
+        snes.ppu.vram_address_hl = xx = 0;
+
+        snes.dma0.control = a = snes.dma.CONTROL_MODE_AB;
+        snes.dma0.mdma_dest = a = <:&snes.ppu.vram_write_data_l;
+        snes.dma0.src_address_hl = xx = &hello_tiles_chr as u16;
+        snes.dma0.src_address_bank = 0;
+        snes.dma0.mdma_size_hl = xx = sizeof(typeof(hello_tiles_chr)) / sizeof(u16);
+
+        snes.ppu.cgram_address = 0;
+
+        snes.dma1.control = a = snes.dma.CONTROL_MODE_A;
+        snes.dma1.mdma_dest = a = <:&snes.ppu.cgram_write_data;
+        snes.dma1.src_address_hl = xx = &bkg_palette_data as u16;
+        snes.dma1.src_address_bank = 0;
+        snes.dma1.mdma_size_hl = xx = sizeof(typeof(bkg_palette_data));
+
+        snes.dma.mdma_enable = a = snes.dma.ENABLE_0 | snes.dma.ENABLE_1;
+
+        let BG1_TILEMAP_BASE_ADDRESS = 0x1000;
+        let BG12_TILESET_BASE_ADDRESS = 0x0000;
+
+        let TEXT_X = 10;
+        let TEXT_Y = 13;
+        let TEXT_TILEMAP_DEST = BG1_TILEMAP_BASE_ADDRESS + TEXT_Y * 32 + TEXT_X;
+
+        snes.ppu.vram_control = a = snes.ppu.VRAM_CONTROL_INCREMENT_1 | snes.ppu.VRAM_CONTROL_SIZE_8;
+        snes.ppu.vram_address_hl = xx = TEXT_TILEMAP_DEST;
+
+        snes.dma0.control = a = snes.dma.CONTROL_MODE_A;
+        snes.dma0.mdma_dest = a = <:&snes.ppu.vram_write_data_l;
+        snes.dma0.src_address_hl = xx = &message as u16;
+        snes.dma0.src_address_bank = 0;
+        snes.dma0.mdma_size_hl = xx = sizeof(typeof(message));
+
+        snes.dma.mdma_enable = a = snes.dma.ENABLE_0;
+
+        snes.ppu.bg1_tilemap = a = BG1_TILEMAP_BASE_ADDRESS >> snes.ppu.BG_TILEMAP_ADDRESS_BIT_ALIGN << snes.ppu.BG_TILEMAP_ADDRESS_SHIFT_LEFT;
+        snes.ppu.bg12_tileset = a = BG12_TILESET_BASE_ADDRESS >> snes.ppu.BG_TILESET_ADDRESS_BIT_ALIGN;
+        snes.ppu.bg_mode = a = 2;
+        snes.ppu.screen_enable_mask = a = snes.ppu.SCREEN_ENABLE_BG1;
+        snes.ppu.brightness = a = 0xF;
+
+        mosaic = 0;
+
+        while true {
+            while !snes.ppu.hvbjoy_status $ snes.ppu.HVBJOY_STATUS_VBLANK_BIT {}
+
+            snes.ppu.mosaic = a = ((mosaic >>> 4) << 4) | 0x1;
+            mosaic = a = mosaic + 0x08;
+
+            a = timer;
+
+            mem16();
+            #[mem16] {
+                aa &= 0xFF;
+                yy = aa <<= 1;
             }
+            mem8();
+
+            xx = *((&sine_table as u16 + yy) as *u16);
+            w0 = xx;
+
+            mem16();
+            #[mem16] {
+                aa = w0;
+
+                inline for in 1 .. 10 { cmp(aa, 0x8000); aa >>>>#= 1; }
+
+                w0 = aa;
+            }
+            mem8();
+
+            snes.ppu.bg1_scroll_y = a = <:w0;
+            snes.ppu.bg1_scroll_y = a = >:w0;
+            ++timer;
+
+            while snes.ppu.hvbjoy_status $ snes.ppu.HVBJOY_STATUS_VBLANK_BIT {}
         }
     }
 
@@ -234,5 +224,5 @@ in prg {
     const minirpg_sprites_chr = embed "minirpg_sprites.chr";
     const spc_main = embed "spc_main.bin";
 
-    const @ 0xFFFC = main;
+    const @ 0x80FFFC = main;
 }

src/wiz/platform/gb_platform.cpp

@@ -181,8 +181,8 @@ namespace wiz {
             [](Report* report, const Bank* bank, std::vector<std::uint8_t>& buffer, const InstructionOptions& options, const std::vector<std::vector<const InstructionOperand*>>& captureLists, SourceLocation location) {
                 buffer.insert(buffer.end(), options.opcode.begin(), options.opcode.end());
 
-                const auto base = static_cast<int>(bank->getAddress().absolutePosition.get());
-                const auto dest = static_cast<int>(captureLists[options.parameter[0]][0]->variant.get<InstructionOperand::Integer>().value);
+                const auto base = static_cast<std::int32_t>(bank->getAddress().absolutePosition.get() & 0xFFFF);
+                const auto dest = static_cast<std::int32_t>(captureLists[options.parameter[0]][0]->variant.get<InstructionOperand::Integer>().value);
                 const auto offset = dest - base - 2;
                 if (offset >= -128 && offset <= 127) {
                     buffer.push_back(offset < 0

src/wiz/platform/mos6502_platform.cpp

@@ -225,8 +225,8 @@ namespace wiz {
             [](Report* report, const Bank* bank, std::vector<std::uint8_t>& buffer, const InstructionOptions& options, const std::vector<std::vector<const InstructionOperand*>>& captureLists, SourceLocation location) {
                 buffer.insert(buffer.end(), options.opcode.begin(), options.opcode.end());
 
-                const auto base = static_cast<int>(bank->getAddress().absolutePosition.get());
-                const auto dest = static_cast<int>(captureLists[options.parameter[0]][0]->variant.get<InstructionOperand::Integer>().value);
+                const auto base = static_cast<std::int32_t>(bank->getAddress().absolutePosition.get() & 0xFFFF);
+                const auto dest = static_cast<std::int32_t>(captureLists[options.parameter[0]][0]->variant.get<InstructionOperand::Integer>().value);
                 const auto offset = dest - base - 2;
                 if (offset >= -128 && offset <= 127) {
                     buffer.push_back(offset < 0

src/wiz/platform/pokemon_mini_platform.cpp

@@ -226,8 +226,8 @@ namespace wiz {
             [](Report* report, const Bank* bank, std::vector<std::uint8_t>& buffer, const InstructionOptions& options, const std::vector<std::vector<const InstructionOperand*>>& captureLists, SourceLocation location) {
                 buffer.insert(buffer.end(), options.opcode.begin(), options.opcode.end());
 
-                const auto base = static_cast<int>(bank->getAddress().absolutePosition.get());
-                const auto dest = static_cast<int>(captureLists[options.parameter[0]][0]->variant.get<InstructionOperand::Integer>().value);
+                const auto base = static_cast<std::int32_t>(bank->getAddress().absolutePosition.get() & 0xFFFF);
+                const auto dest = static_cast<std::int32_t>(captureLists[options.parameter[0]][0]->variant.get<InstructionOperand::Integer>().value);
                 const auto offset = dest - base - 2;
                 if (offset >= -128 && offset <= 127) {
                     buffer.push_back(offset < 0

src/wiz/platform/spc700_platform.cpp

@@ -273,8 +273,8 @@ namespace wiz {
             [](Report* report, const Bank* bank, std::vector<std::uint8_t>& buffer, const InstructionOptions& options, const std::vector<std::vector<const InstructionOperand*>>& captureLists, SourceLocation location) {
                 buffer.insert(buffer.end(), options.opcode.begin(), options.opcode.end());
 
-                const auto base = static_cast<int>(bank->getAddress().absolutePosition.get());
-                const auto dest = static_cast<int>(captureLists[options.parameter[0]][0]->variant.get<InstructionOperand::Integer>().value);
+                const auto base = static_cast<std::int32_t>(bank->getAddress().absolutePosition.get() & 0xFFFF);
+                const auto dest = static_cast<std::int32_t>(captureLists[options.parameter[0]][0]->variant.get<InstructionOperand::Integer>().value);
                 const auto offset = dest - base - 2;
                 if (offset >= -128 && offset <= 127) {
                     buffer.push_back(offset < 0

src/wiz/platform/wdc65816_platform.cpp

@@ -601,8 +601,8 @@ namespace wiz {
             [](Report* report, const Bank* bank, std::vector<std::uint8_t>& buffer, const InstructionOptions& options, const std::vector<std::vector<const InstructionOperand*>>& captureLists, SourceLocation location) {
                 buffer.insert(buffer.end(), options.opcode.begin(), options.opcode.end());
 
-                const auto base = static_cast<int>(bank->getAddress().absolutePosition.get());
-                const auto dest = static_cast<int>(captureLists[options.parameter[0]][0]->variant.get<InstructionOperand::Integer>().value);
+                const auto base = static_cast<std::int32_t>(bank->getAddress().absolutePosition.get() & 0xFFFF);
+                const auto dest = static_cast<std::int32_t>(captureLists[options.parameter[0]][0]->variant.get<InstructionOperand::Integer>().value);
                 const auto offset = dest - base - 2;
                 if (offset >= -128 && offset <= 127) {
                     buffer.push_back(offset < 0
@@ -623,7 +623,7 @@ namespace wiz {
             [](Report* report, const Bank* bank, std::vector<std::uint8_t>& buffer, const InstructionOptions& options, const std::vector<std::vector<const InstructionOperand*>>& captureLists, SourceLocation location) {
                 buffer.insert(buffer.end(), options.opcode.begin(), options.opcode.end());
 
-                const auto base = static_cast<std::int32_t>(bank->getAddress().absolutePosition.get());
+                const auto base = static_cast<std::int32_t>(bank->getAddress().absolutePosition.get() & 0xFFFF);
                 const auto dest = static_cast<std::int32_t>(captureLists[options.parameter[0]][0]->variant.get<InstructionOperand::Integer>().value);
                 const auto offset = dest - base - 3;
                 if (offset >= -32768 && offset <= 32767) {

src/wiz/platform/z80_platform.cpp

@@ -207,8 +207,8 @@ namespace wiz {
             [](Report* report, const Bank* bank, std::vector<std::uint8_t>& buffer, const InstructionOptions& options, const std::vector<std::vector<const InstructionOperand*>>& captureLists, SourceLocation location) {
                 buffer.insert(buffer.end(), options.opcode.begin(), options.opcode.end());
 
-                const auto base = static_cast<int>(bank->getAddress().absolutePosition.get());
-                const auto dest = static_cast<int>(captureLists[options.parameter[0]][0]->variant.get<InstructionOperand::Integer>().value);
+                const auto base = static_cast<std::int32_t>(bank->getAddress().absolutePosition.get() & 0xFFFF);
+                const auto dest = static_cast<std::int32_t>(captureLists[options.parameter[0]][0]->variant.get<InstructionOperand::Integer>().value);
                 const auto offset = dest - base - 2;
                 if (offset >= -128 && offset <= 127) {
                     buffer.push_back(offset < 0