hexed: fixup for newer binutils
[megadrive.git] / hexed / hexed.s
index 93d5d35..ae77a3e 100644 (file)
@@ -1,6 +1,6 @@
 ###############################################################################
 #
-# Copyright (c) 2009, Gražvydas Ignotas
+# Copyright (c) 2009,2011 Gražvydas Ignotas
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 #       names of its contributors may be used to endorse or promote products
 #       derived from this software without specific prior written permission.
 #
-# THIS SOFTWARE IS PROVIDED ''AS IS'' AND ANY
+# THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND ANY
 # EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 # WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL <copyright holder> BE LIABLE FOR ANY
+# DISCLAIMED. IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE FOR ANY
 # DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
 # (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
 # LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
 #   --register-prefix-optional --bitwise-or
 #
 
+.equ USE_VINT,        0
+.equ COPY_TO_EXP,     1
+.equ RELOCATE_TO_RAM, 1
+
 .text
 .globl main
 .globl INT
 .globl VBL
+.globl return_to_main
 
 ##################################################
 #                                                #
@@ -77,6 +82,7 @@
 .equ MMODE_START_MENU, 4
 .equ MMODE_GOTO_PREDEF,        5
 .equ MMODE_JMP_ADDR,   6
+.equ MMODE_PC,         7
 
 .equ predef_addr_cnt,  ((predef_addrs_end-predef_addrs)/4)
 
 
 # Set up address in VDP, control port in dst
 .macro VRAM_ADDR adr dst
-       move.l #(((0x4000 | (\adr & 0x3fff)) << 16) | (\adr >> 14)),\dst
+       move.l #(0x40000000 | ((\adr & 0x3fff) << 16) | (\adr >> 14)),\dst
+.endm
+
+.macro VSRAM_ADDR adr dst
+       move.l #(0x40000010 | ((\adr & 0x3fff) << 16) | (\adr >> 14)),\dst
 .endm
 
 
 .macro do_dpad bit op val
        btst.l          #\bit,d0
        beq             0f
-       \op.l           \val,a6
+       \op             \val,a6
        bra             dpad_end
 0:
 .endm
        or.w            #(\mode_back<<11)|(\mode_new<<8),d7
 .endm
 
+#  destroys a0,d0-d2
 .macro menu_text str x y pal
-       lea             \str,a0
+       lea             (\str,pc),a0
        move.l          #\x,d0
        move.l          #\y,d1
        move.l          #0x8000|(\pal<<13),d2
@@ -192,7 +203,8 @@ sprite_data_end:
 
 predef_addrs:
        dc.l 0x000000, 0x200000, 0x400000, 0xa00000, 0xa10000
-       dc.l 0xa11100, 0xa12000, 0xa13000, 0xa14000, 0xc00000
+       dc.l 0xa11100, 0xa12000, 0xa13000, 0xa14000, 0xa15100
+       dc.l 0xc00000
 predef_addrs_end:
 
 safe_addrs:
@@ -203,21 +215,34 @@ safe_addrs:
        dc.l 0xa12000, 0xa120ff
        dc.l 0xa13000, 0xa130ff
 safe_addrs_end:
+       dc.l 0xa15100, 0xa1513f
+safe_addrs_end_32x:
+       dc.l 0xa15180, 0xa153ff
+safe_addrs_end_32x_vdp:
+
+sizeof_bin:
+       dc.l _edata
 
 txt_edit:
        .ascii  "- edit -\0"
 txt_a_confirm:
        .ascii  "A-confirm\0"
 txt_about:
-       .ascii  "hexed r1\0"
+       .ascii  "hexed r2\0"
 txt_goto:
        .ascii  "Go to address\0"
 txt_goto_predef:
        .ascii  "Go to (predef)\0"
 txt_jmp_addr:
        .ascii  "Jump to address\0"
+txt_dump:
+       .ascii  "PC Transfer\0"
 txt_dtack:
        .ascii  "DTACK safety\0"
+txt_transfer_ready:
+       .ascii  "Transfer Ready\0"
+txt_working:
+       .ascii  "PC mode       \0"
 txt_dtack_err:
        .ascii  "DTACK err?\0"
 txt_exc:
@@ -240,25 +265,100 @@ txt_exc:
 .align 2
 
 main:
-       /* mask irqs during init */
+       /* make sure io port 2 is doing inputs */
+       move.b          #0,(0xa1000b).l
+       /* make sure irqs are masked */
        move.w          #0x2700,sr
+       /* take care of TMSS */
+       move.b          (0xa10000).l,d0
+       andi.b          #0x0f,d0
+       beq             no_tmss
+       move.l          #0x53454741,(0xa14000).l
+       /* want cart, not OS rom if cart pops in */
+       move.w          #1,(0xa14100).l
+       /* touch VDP after TMSS setup? */
+       tst.w           (0xc00004).l
+no_tmss:
+
+       /* want to do early PC transfer (with RAM/VRAM intact and such)?
+        * also give time PC to see start condition */
+       move.l          #0x2000,d0
+0:     dbra            d0,0b
+
+       move.l          #0xa10005,a0
+       btst.b          #5,(a0)
+       bne             no_early_transfer
+move.b #1,(0)
+       move.b          #0x40,(0xa1000b).l      /* port 2 ctrl */
+       move.b          #0x00,(a0)              /* port 2 data - start with TH low */
+       move.l          #0x2000,d0
+0:
+       btst.b          #4,(a0)
+       beq             do_early_transfer
+       dbra            d0,0b
 
-.if 0
-       /* copy */
-       lea             (0,pc),a0
-       move.l          a0,d0
-       swap            d0
-       lsr.l           #4,d0
-       and.b           #0x0f,d0
-       cmp.b           #0,d0
+move.b #2,(0)
+       move.b          #0,(0xa1000b).l
+       bra             no_early_transfer       /* timeout */
+
+do_early_transfer:
+move.b #9,(0)
+       bsr             do_transfer
+
+no_early_transfer:
+
+.if COPY_TO_EXP
+       /* copy to expansion device if magic number is set */
+       move.l          #0x400000,a1
+       cmp.w           #0x1234,(a1)
        bne             0f
 
-       move.w          #8000/2,d0
        move.l          #0,a0
-       move.l          #0x400000,a1
+       move.l          (sizeof_bin,pc),d0
+       lsr.l           #3,d0
+1:
+       move.l          (a0)+,(a1)+
+       move.l          (a0)+,(a1)+
+       dbra            d0,1b
+0:
+.endif
+
+.if RELOCATE_TO_RAM
+       /* we could be relocated by 32x or something else, adjust start addr */
+       lea             (pc),a0
+       move.l          a0,d0
+       and.l           #0xff0000,d0
+       move.l          d0,a0
+
+       /* copy, assume 8K size */
+       move.l          #0xFF0100,a1
+       move.l          (sizeof_bin,pc),d0
+       lsr.l           #3,d0
+1:
+       move.l          (a0)+,(a1)+
+       move.l          (a0)+,(a1)+
+       dbra            d0,1b
+
+       /* copy test code */
+       lea             (test_code,pc),a0
+       move.l          #0xffc000,a1
+       move.w          #(test_code_end - test_code)/2-1,d0
 1:
        move.w          (a0)+,(a1)+
        dbra            d0,1b
+
+       lea             (0f,pc),a0
+       move.l          a0,d0
+       and.l           #0x00ffff,d0
+       add.l           #0xFF0100,d0
+       move.l          d0,a0
+
+       /* patch test code */
+       move.l          #0xffc000,a1
+       add.w           #(test_code_ret_op-test_code+2),a1
+       move.l          a0,(a1)
+
+       jmp             (a0)
 0:
 .endif
 
@@ -273,15 +373,22 @@ main:
        /* Initialize VDP */
        jsr             init_gfx
 
+       /* Clear h/v scroll */
+       movea.l         #GFXDATA,a0
+       VRAM_ADDR       0x8000,(GFXCNTL)
+       move.l          #0,(a0)
+       VSRAM_ADDR      0,(GFXCNTL)
+       move.l          #0,(a0)
+
        /* Load color data */
        movea.l         #0,a0
-       movea.l         #colors,a1
+       lea             (colors,pc),a1
        moveq.l         #(colors_end-colors)/2,d0
        jsr             load_colors
 
        /* load font patterns */
-       lea             GFXDATA,a0
-       lea             font,a1
+       movea.l         #GFXDATA,a0
+       lea             (font,pc),a1
        VRAM_ADDR       0,(GFXCNTL)
        move.w          #128*8,d3
 font_loop:
@@ -323,45 +430,41 @@ lmaploop0:
        /* upload sprite data */
        movea.l         #0xfc00,a0
        jsr             load_prepare
-       movea.l         #sprite_data,a1
+       lea             (sprite_data,pc),a1
 
        move.l          #(sprite_data_end-sprite_data)/2-1,d3
 0:     move.l          (a1)+,(a0)
        dbra            d3,0b
 
+.if USE_VINT
        /* wait for vsync before unmask */
-       move.l          #GFXCNTL,a3
-0:
-       move.w          (a3),d0
-       and.b           #8,d0
-       nop
-       nop
-       bne             0b
-0:
-       move.w          (a3),d0
-       and.b           #8,d0
-       nop
-       nop
-       beq             0b
+       jsr             wait_vsync_poll
 
        /* wait a bit to avoid nested vint */
        move.w          #20,d0
 0:
        dbra            d0,0b           /* 10 cycles to go back */
 
-       /* enable vint */
+       /* enable and unmask vint */
+       write_vdp_r_dst 1,(VDP1_E_VBI | VDP1_E_DISPLAY | VDP1_MODE5),(GFXCNTL)
        move.w          #0x2000,sr
+.endif
 
 ##################################################
 
 forever:
+.if USE_VINT
        jsr             wait_vsync
+.else
+       jsr             wait_vsync_poll
+       jsr             VBL
+.endif
        bra             forever
 
 
 INT:
        /* let's hope VRAM is already set up.. */
-       lea             txt_exc,a0
+       lea             (txt_exc,pc),a0
        move.l          #9,d0
        move.l          #27,d1
        move.l          #0xe000,d2
@@ -374,27 +477,34 @@ VBL:
        addq.b          #1,d7
 #      movem.l         d0-d4/a0-a5,-(a7)
 
+       btst.b          #5,(0xa10005).l
+       bne             no_auto_transfer
+       change_mode     MMODE_PC, MMODE_MAIN
+       write_vdp_r_dst 12,(VDP12_SCREEN_V224 | VDP12_SCREEN_H320 | VDP12_STE),(GFXCNTL)
+
+no_auto_transfer:
        moveq.l         #0,d0
        move.w          d7,d0
        lsr.w           #6,d0
        and.w           #0x1c,d0
-       move.l          (jumptab,pc,d0),a0
+       lea             (jumptab,pc,d0),a0
        jmp             (a0)
 jumptab:
-       dc.l            mode_main
-       dc.l            mode_val_input
-       dc.l            mode_edit_val   /* edit val in editor */
-       dc.l            mode_goto
-       dc.l            mode_start_menu
-       dc.l            mode_goto_predef
-       dc.l            mode_jmp_addr
-       dc.l            mode_main
+       /* branch insns here because we want to be position independent */
+       bra             mode_main
+       bra             mode_val_input
+       bra             mode_edit_val   /* edit val in editor */
+       bra             mode_goto
+       bra             mode_start_menu
+       bra             mode_goto_predef
+       bra             mode_jmp_addr
+       bra             mode_transfer
 
 ##################### main #######################
 
 mode_main:
        /* assume we will hang */
-       lea             txt_dtack_err,a0
+       lea             (txt_dtack_err,pc),a0
        move.l          #9,d0
        move.l          #27,d1
        move.l          #0xe000,d2
@@ -641,20 +751,20 @@ draw_status_bar:
        btst.l          #16+4,d0                /* A - scroll modifier */
        beq             input_noa
 
-       do_dpad         16+0,  sub, #0x0800
-       do_dpad         16+1,  add, #0x0800
-       do_dpad         16+10, sub, #0xd800
-       do_dpad         16+11, add, #0xd800
+       do_dpad         16+0,  sub.l, #0x0800
+       do_dpad         16+1,  add.l, #0x0800
+       do_dpad         16+10, sub.l, #0xd800
+       do_dpad         16+11, add.l, #0xd800
 input_noa:
        moveq.l         #0,d1
        move.w          d7,d1
        lsr.w           #7,d1
        lsr.w           #7,d1
 
-       do_dpad         0,  subq, #0x0008
-       do_dpad         1,  addq, #0x0008
-       do_dpad         10, sub, d1
-       do_dpad         11, add, d1
+       do_dpad         0,  subq.l, #0x0008
+       do_dpad         1,  addq.l, #0x0008
+       do_dpad         10, sub.l, d1
+       do_dpad         11, add.l, d1
 
 dpad_end:
        /* update addr */
@@ -699,7 +809,11 @@ input_noc:
 input_nos:
 vbl_end:
 #      movem.l         (a7)+,d0-d4/a0-a5
+.if USE_VINT
        rte
+.else
+       rts
+.endif
 
 
 draw_cursor_unsafe_byte:
@@ -716,7 +830,7 @@ draw_cursor_unsafe_byte:
        move.l          a2,a0
        add.w           #31*2,a0
        jsr             load_prepare    /* restore a0 */
-       jmp             draw_chars_hsafe_pre
+       bra             draw_chars_hsafe_pre
 
 draw_cursor_unsafe_word:
        move.l          a6,d0
@@ -737,7 +851,7 @@ draw_cursor_unsafe_word:
        move.l          a2,a0
        add.w           #29*2,a0
        jsr             load_prepare    /* restore a0 */
-       jmp             draw_chars_hsafe_pre
+       bra             draw_chars_hsafe_pre
 
 
 draw_cursor_byte:
@@ -758,7 +872,7 @@ draw_cursor_byte:
        add.w           #31*2,a0
        jsr             load_prepare    /* restore a0 */
 
-       jmp             draw_chars_pre
+       bra             draw_chars_pre
 
 draw_cursor_word:
        move.l          a6,d0
@@ -780,7 +894,7 @@ draw_cursor_word:
        add.w           #29*2,a0
        jsr             load_prepare    /* restore a0 */
 
-       jmp             draw_chars_pre
+       bra             draw_chars_pre
 
 
 #################### hedit #######################
@@ -806,7 +920,7 @@ mode_edit_val:
 1:
 
        change_mode     MMODE_VAL_INPUT, MMODE_EDIT_VAL
-       jmp             vbl_end
+       bra             vbl_end
 
 mode_hedit_finish:
        /* write the val */
@@ -838,7 +952,7 @@ mode_goto:
        or.b            #3,d5           /* 3 bytes */
        bclr.l          #7,d6
        change_mode     MMODE_VAL_INPUT, MMODE_GOTO
-       jmp             vbl_end
+       bra             vbl_end
 
 mode_goto_finish:
        lsr.l           #8,d5
@@ -875,13 +989,13 @@ mode_val_input:
        dbra            d1,0b
 
        /* text */
-       lea             txt_edit,a0
+       lea             (txt_edit,pc),a0
        move.l          #15,d0
        move.l          #11,d1
        move.l          #0xc000,d2
        jsr             print
 
-       lea             txt_a_confirm,a0
+       lea             (txt_a_confirm,pc),a0
        move.l          #15,d0
        move.l          #15,d1
        move.l          #0xc000,d2
@@ -967,7 +1081,7 @@ mode_val_input:
        eor.l           #0xffffffff,d3
        and.l           d3,d5
        or.l            d1,d5
-       jmp             vbl_end
+       bra             vbl_end
 
 ai_no_ud:
        btst.l          #10,d0
@@ -988,7 +1102,7 @@ ai_no_ud:
        and.b           #0xe3,d5
        lsl.b           #2,d2
        or.b            d2,d5
-       jmp             vbl_end
+       bra             vbl_end
 
 ai_no_dpad:
        move.w          d0,d1
@@ -1008,7 +1122,7 @@ ai_no_sb:
        or.w            d1,d7
 
 ai_no_input:
-       jmp             vbl_end
+       bra             vbl_end
 
 
 ################### start menu ###################
@@ -1022,11 +1136,12 @@ mode_start_menu:
        menu_text       txt_goto,        13, 11, 0
        menu_text       txt_goto_predef, 13, 12, 0
        menu_text       txt_jmp_addr,    13, 13, 0
-       menu_text       txt_dtack,       13, 14, 0
-       menu_text       txt_a_confirm,   13, 16, 2
+       menu_text       txt_dump,        13, 14, 0
+       menu_text       txt_dtack,       13, 15, 0
+       menu_text       txt_a_confirm,   13, 17, 2
 
        /* dtack safety on/off */
-       movea.l         #0xe000+26*2+14*64*2,a0
+       movea.l         #0xe000+26*2+15*64*2,a0
        jsr             load_prepare
        move.w          #0x8000|'O',(a0)
        btst.l          #4,d6
@@ -1042,7 +1157,7 @@ mode_start_menu:
        movea.l         #0xe000+11*2+11*64*2,a0
        moveq.l         #0,d0
        move.b          d5,d0
-       and.b           #3,d0
+       and.b           #7,d0
        lsl.w           #7,d0
        add.w           d0,a0
        jsr             load_prepare
@@ -1055,50 +1170,56 @@ mode_start_menu:
        and.w           #3,d1
        beq             msm_no_ud
        move.b          d5,d1
-       and.b           #3,d1
+       and.b           #7,d1
        btst.l          #0,d0
        sne             d2
        or.b            #1,d2           /* up -1, down 1 */
        add.b           d2,d1
        cmp.b           #0,d1
        bge             0f
-       move.b          #3,d1
+       move.b          #4,d1
 0:
-       cmp.b           #3,d1
+       cmp.b           #4,d1
        ble             0f
        move.b          #0,d1
 0:
-       and.b           #0xfc,d5
+       and.b           #0xf8,d5
        or.b            d1,d5
-       jmp             vbl_end
+       bra             vbl_end
 
 msm_no_ud:
        btst.l          #4,d0           /* A - confirm */
        beq             msm_no_a
        move.b          d5,d1
-       and.b           #3,d1
+       and.b           #7,d1
        bne             0f
        change_mode     MMODE_GOTO, MMODE_MAIN
        bsr             start_menu_box
-       jmp             vbl_end
+       bra             vbl_end
 0:
        cmp.b           #1,d1
        bne             0f
        moveq.l         #0,d5
        change_mode     MMODE_GOTO_PREDEF, MMODE_MAIN
        bsr             start_menu_box
-       jmp             vbl_end
+       bra             vbl_end
 0:
        cmp.b           #2,d1
        bne             0f
        change_mode     MMODE_JMP_ADDR, MMODE_MAIN
        bsr             start_menu_box
-       jmp             vbl_end
+       bra             vbl_end
 0:
        cmp.b           #3,d1
        bne             0f
+       change_mode     MMODE_PC, MMODE_MAIN
+       bsr             start_menu_box
+       bra             vbl_end
+0:
+       cmp.b           #4,d1
+       bne             0f
        bchg.l          #4,d6
-       jmp             vbl_end
+       bra             vbl_end
 0:
 
 msm_no_a:
@@ -1108,11 +1229,11 @@ msm_no_a:
        bra             return_to_main
 
 msm_no_bc:
-       jmp             vbl_end
+       bra             vbl_end
 
 start_menu_box:
        movea.l         #0xe000+10*2+8*64*2,a1
-       move.w          #10-1,d1
+       move.w          #11-1,d1
 0:
        move.w          a1,a0
        jsr             load_prepare
@@ -1144,7 +1265,7 @@ mode_goto_predef:
 
        /* draw addresses */
        movea.l         #0xe000+17*2+9*64*2,a1
-       lea             predef_addrs,a2
+       lea             (predef_addrs,pc),a2
        move.w          #predef_addr_cnt-1,d4
        move.l          #0x8006,d3
 mgp_da_loop:
@@ -1182,7 +1303,7 @@ mgp_da_loop:
        ble             0f
        move.b          #0,d5
 0:
-       jmp             vbl_end
+       bra             vbl_end
 
 mgp_no_ud:
        btst.l          #4,d0           /* A - confirm */
@@ -1190,10 +1311,10 @@ mgp_no_ud:
        moveq.l         #0,d0
        move.b          d5,d0
        lsl.w           #2,d0
-       lea             predef_addrs,a0
+       lea             (predef_addrs,pc),a0
        move.l          (a0,d0),d5
        lsl.l           #8,d5
-       jmp             mode_goto_finish
+       bra             mode_goto_finish
 
 mgp_no_a:
        move.w          d0,d1
@@ -1202,7 +1323,7 @@ mgp_no_a:
        bra             return_to_main
 
 mgp_no_bc:
-       jmp             vbl_end
+       bra             vbl_end
 
 ##################### jmp ########################
 
@@ -1214,7 +1335,7 @@ mode_jmp_addr:
        or.b            #3,d5           /* 3 bytes */
        bclr.l          #7,d6
        change_mode     MMODE_VAL_INPUT, MMODE_JMP_ADDR
-       jmp             vbl_end
+       bra             vbl_end
 
 mode_jmp_finish:
        lsr.l           #8,d5
@@ -1222,13 +1343,31 @@ mode_jmp_finish:
        move.l          d5,a0
        jmp             (a0)
 
+mode_transfer:
+       move.b          #0x40,(0xa1000b).l      /* port 2 ctrl */
+       move.b          #0x00,(0xa10005).l      /* port 2 data - start with TH low */
+
+       lea             (txt_transfer_ready,pc),a0
+       move.l          #13,d0
+       move.l          #13,d1
+       move.l          #0x8000,d2
+       jsr             print
+
+wait_tl_low0:
+       move.b          (0xa10005),d0
+       btst.b          #4,d0
+       bne             wait_tl_low0
+
+       menu_text       txt_working, 13, 13, 0
+       bsr             do_transfer
+       bra             return_to_main
 
 # go back to main mode
 return_to_main:
        bclr.l          #7,d6           /* not edited */
        change_mode     MMODE_MAIN, MMODE_MAIN
        write_vdp_r_dst 12,(VDP12_SCREEN_V224 | VDP12_SCREEN_H320),(GFXCNTL)
-       jmp             vbl_end
+       bra             vbl_end
 
 
 #################################################
@@ -1240,21 +1379,22 @@ return_to_main:
 init_gfx:
        move.l          #GFXCNTL,a3
        write_vdp_reg   0,(VDP0_E_DISPLAY | VDP0_PLTT_FULL)
-       write_vdp_reg   1,(VDP1_E_VBI | VDP1_E_DISPLAY | VDP1_MODE5)
+       write_vdp_reg   1,(VDP1_E_DISPLAY | VDP1_MODE5)
        write_vdp_reg   2,(0xe000 >> 10)        /* Screen map a adress */
        write_vdp_reg   3,(0xe000 >> 10)        /* Window address */
        write_vdp_reg   4,(0xc000 >> 13)        /* Screen map b address */
        write_vdp_reg   5,(0xfc00 >>  9)        /* Sprite address */
        write_vdp_reg   6,0     
        write_vdp_reg   7,0                     /* Backdrop color */
-       write_vdp_reg   10,1                    /* Lines per hblank interrupt */
-       write_vdp_reg   11,0                    /* 2-cell vertical scrolling */
-       write_vdp_reg   12,(VDP12_SCREEN_V224 | VDP12_SCREEN_H320)
-       write_vdp_reg   13,(0x8000 >> 10)       /* Horizontal scroll address */
-       write_vdp_reg   15,2
-       write_vdp_reg   16,(VDP16_MAP_V32 | VDP16_MAP_H64)      /* layer size */
-       write_vdp_reg   17,0
-       write_vdp_reg   18,0xff
+       write_vdp_reg   0x0a,1                  /* Lines per hblank interrupt */
+       write_vdp_reg   0x0b,0                  /* 2-cell vertical scrolling */
+       write_vdp_reg   0x0c,(VDP12_SCREEN_V224 | VDP12_SCREEN_H320)
+       write_vdp_reg   0x0d,(0x8000 >> 10)     /* Horizontal scroll address */
+       write_vdp_reg   0x0e,0
+       write_vdp_reg   0x0f,2
+       write_vdp_reg   0x10,(VDP16_MAP_V32 | VDP16_MAP_H64)    /* layer size */
+       write_vdp_reg   0x11,0
+       write_vdp_reg   0x12,0
        rts
 
 
@@ -1265,8 +1405,21 @@ get_safety_mask:
        move.l          a1,d1
        lsl.l           #8,d1
        lsr.l           #8,d1
-       lea             safe_addrs,a1
+       lea             (safe_addrs,pc),a1
        move.w          #(safe_addrs_end - safe_addrs)/8-1,d2
+       cmp.l           #0x4D415253,(0xa130ec)  /* 'MARS' */
+       bne             no_32x
+       move.w          #(safe_addrs_end_32x - safe_addrs)/8-1,d2
+       move.w          (0xa15100),d0
+       and.w           #3,d0
+       cmp.w           #3,d0                   /* ADEN and nRES */
+       bne             no_32x_vdp
+       btst.b          #7,d0                   /* FM */
+       bne             no_32x_vdp
+       move.w          #(safe_addrs_end_32x_vdp - safe_addrs)/8-1,d2
+no_32x_vdp:
+no_32x:
+
 0:
        move.l          (a1)+,d0
        cmp.l           d0,d1
@@ -1411,7 +1564,7 @@ _print_loop:
        beq             _print_end
 
        move.w          d0,(a0)
-       jmp             _print_loop
+       bra             _print_loop
 
 _print_end:
        rts
@@ -1454,7 +1607,7 @@ _print_hex_loop:
        rts
 
 
-# wait vertical sync
+# wait vertical sync interrupt
 
 wait_vsync:
        move.b          d7,d0
@@ -1465,6 +1618,33 @@ _wait_change:
        rts
 
 
+# wait vsync start (polling)
+#  destroys a0,d0
+
+wait_vsync_poll:
+       move.l          #GFXCNTL,a0
+0:
+       move.w          (a0),d0
+       and.b           #8,d0
+       nop
+       nop
+       bne             0b
+0:
+       move.w          (a0),d0
+       and.b           #8,d0
+       nop
+       nop
+       beq             0b
+       rts
+
+
+test_code:
+       nop
+
+test_code_ret_op:
+       jmp     0x123456        /* will be patched */
+test_code_end:
+
 #################################################
 #                                               #
 #                 RAM DATA                      #