diablo controls dialog

[drnoksnes] / os9x_65c816.s

diff --git a/os9x_65c816.s b/os9x_65c816.s
index 766c5c8..30aba8f 100644 (file)
--- a/os9x_65c816.s
+++ b/os9x_65c816.s
@@ -1,10 +1,8 @@
-       .DATA
+
 /****************************************************************      
 ****************************************************************/
-       .align 4
-
-    @ notaz
-       .equiv ASM_SPC700,              1               ;@ 1 = use notaz's ASM_SPC700 core
+@ notaz
+.equiv ASM_SPC700,             1               ;@ 1 = use notaz's ASM_SPC700 core
 
 /****************************************************************
        DEFINES
@@ -37,24 +35,11 @@ rscratch9   .req R10 @ ??????
 reg_cpu_var .req R14
 
 
-
 @ not used
 @ R13  @ Pointer 32 bit on a struct.
 
 @ R15 = pc (sic!)
 
-
-/*
-.equ Carry       1
-.equ Zero        2
-.equ IRQ         4
-.equ Decimal     8
-.equ IndexFlag  16
-.equ MemoryFlag 32
-.equ Overflow   64
-.equ Negative  128
-.equ Emulation 256*/
-
 .equ STATUS_SHIFTER,           24
 .equ MASK_EMUL,                (1<<(STATUS_SHIFTER-1))
 .equ MASK_SHIFTER_CARRY,       (STATUS_SHIFTER+1)
@@ -594,7 +579,6 @@ reg_cpu_var .req R14
 .endif
 .endm
 
-@ #include "os9x_65c816_mac_mem.h"
 .macro         S9xGetWord      
                @  in  : rscratch (0x00hhmmll)
                @  out : rscratch (0xhhll0000)
@@ -1150,6 +1134,8 @@ reg_cpu_var .req R14
 
 .text
 
+.align 4
+
 .globl asmS9xGetByte
 .globl asmS9xGetWord
 .globl asmS9xSetByte
@@ -2878,7 +2864,7 @@ SW_not_aligned4:
 1111:
 .endm
 .macro         Op30    /*BMI*/
-               asmRelative             
+               asmRelative
                BranchCheck0
                TST             rstatus, #MASK_NEG
                BEQ             1111f
@@ -3100,15 +3086,14 @@ SW_not_aligned4:
 .endm
 .macro         OpAB
                BIC             reg_d_bank,reg_d_bank, #0xFF
-               PullBrS         
+               PullBrS
                ORR             reg_d_bank,reg_d_bank,rscratch, LSR #24
                UPDATE_ZN
                ADD2CYCLE
 .endm
-.macro         Op2B            
-               BIC             reg_d,reg_d, #0xFF000000
-               BIC             reg_d,reg_d, #0x00FF0000
-               PullWrS         
+.macro         Op2B
+               UXTH    reg_d,reg_d
+               PullWrS
                ORR             reg_d,rscratch,reg_d
                UPDATE_ZN
                ADD2CYCLE