diff options
| author | Astrid Smith | 2010-06-08 00:43:55 -0700 |
|---|---|---|
| committer | Astrid Smith | 2010-06-08 00:43:55 -0700 |
| commit | 7aff693b9cb7c2a69e79a9f47476b732960f10d8 (patch) | |
| tree | 0f44b3abbabba8e33b46b18ae549d67aa003959e /main.asm | |
| parent | cf99c1ca8bc3ba0facfe2a89ad03d9764e0f9af8 (diff) | |
More fixes
Added alignment
Dropped the jump table
F_ADD_B and F_SUB_B should work okay now
still this is all untested ...
Diffstat (limited to 'main.asm')
| -rw-r--r-- | main.asm | 528 |
1 files changed, 219 insertions, 309 deletions
@@ -4,6 +4,10 @@ ;;; Project started: 2010-06-06 ;;; GPL +;;; Yes, I use lots of big ascii art. With this much code, you need +;;; something to catch your eye when scrolling through it. I suppose +;;; I'll split it into different files later. + ;;; Registers used: ;;; ;;; A7 = sp @@ -80,6 +84,12 @@ FETCHWI MACRO ; 36 cycles, 12 bytes ;; == Common Opcode Macros ========================================= + ;; Forces alignment +_align SET 0 +START MACRO + ORG emu_plain_op+_align +_align SET _align+32 + ENDM ;; When you want to use the high reg of a pair, use this first LOHI MACRO ; 6 cycles, 2 bytes ror #8,\1 @@ -100,30 +110,36 @@ DONE MACRO ; 8 cycles, 2 bytes ;; == Special Opcode Macros ======================================== ;; Set flags appropriately for an ADD \1,\2 -F_ADD_B MACRO +F_ADD_B MACRO ; 14 bytes? ;; preserve operands for flagging - move.b \1,add_src - move.b \2,add_dst + move.b \1,tmp_src + move.b \2,tmp_dst moveq #0,flag_n + moveq #1,tmp_byte ;; XXX do I have to use SR instead? move ccr,68k_ccr ENDM ;; Set flags appropriately for a SUB \1,\2 -F_SUB_B MACRO +F_SUB_B MACRO ;14 bytes? + ;; preserve operands for flagging + move.b \1,tmp_src + move.b \2,tmp_dst + moveq #1,flag_n + moveq #1,tmp_byte + ;; XXX do I have to use SR instead? + move ccr,68k_ccr + ENDM + + ;; Set flags appropriately for a ADD \1,\2, both words +F_ADD_W MACRO + ENDM + ;; Set flags appropriately for a SUB \1,\2, both words +F_SUB_W MACRO ENDM -;; ========================================================================= -;; -;; _ _ _ _ -;; __| (_)___ _ __ __ _| |_ ___| |__ -;; / _` | / __| '_ \ / _` | __/ __| '_ \ -;; | (_| | \__ \ |_) | (_| | || (__| | | | -;; \__,_|_|___/ .__/ \__,_|\__\___|_| |_| -;; |_| -;; -;; ========================================================================= + @@ -142,30 +158,42 @@ refresh: ; screen refresh routine ;; XXX Do this rts +;; ========================================================================= +;; instruction instruction instruction ================================ +;; _ _ _ _ ================================ +;; __| (_)___ _ __ __ _| |_ ___| |__ ================================ +;; / _` | / __| '_ \ / _` | __/ __| '_ \ ================================ +;; | (_| | \__ \ |_) | (_| | || (__| | | | ================================ +;; \__,_|_|___/ .__/ \__,_|\__\___|_| |_| ================================ +;; |_| ================================= +;; ========== ======================================================== +;; ========================================================================= + emu_fetch: - ;; Will this even work? - eor.w d0,d0 ; 4 cycles - move.b (a4)+,d0 ; 8 cycles - asl #1,d0 ; 6 cycles - movea (a3,d0.w),a5 ;14 cycles - jmp (a5) ; 8 cycles - ; Total: 40 cycles - -emu_alt_fetch: - ;; Allows me to get rid of the jump table and save cycles at - ;; the same time, but requires spacing instruction routines - ;; evenly + ;; Move this into DONE, saving 8 more cycles but using extra + ;; space. + ;; + ;; See if I can get rid of the eor eor.w d0,d0 ; 4 cycles move.b (a4)+,d0 ; 8 cycles - rol.w #5,d0 ; 4 cycles + rol.w #5,d0 ; 4 cycles adjust to actual alignment jmp (a3,d0) ;14 cycles ;; overhead: 30 cycles storage: -add_src: dc.b 0 -add_dst: dc.b 0 -flag_n: dc.b 0 -68k_ccr: dc.w 0 + ;; 1 if tmp_???b is valid, 0 if tmp_???w is valid +tmp_byte: ds.b 0 + + ;; byte operands +tmp_srcb: ds.b 0 +tmp_dstb: ds.b 0 + + ;; word operands +tmp_srcw: ds.w 0 +tmp_dstw: ds.w 0 + +flag_n: ds.b 0 +68k_ccr: ds.w 0 ;;; ======================================================================== ;;; ======================================================================== @@ -178,275 +206,19 @@ flag_n: dc.b 0 ;;; ======================================================================== ;;; ======================================================================== - -emu_instr_table: - dc.w emu_op_00-emu_instr_table - dc.w emu_op_01-emu_instr_table - dc.w emu_op_02-emu_instr_table - dc.w emu_op_03-emu_instr_table - dc.w emu_op_04-emu_instr_table - dc.w emu_op_05-emu_instr_table - dc.w emu_op_06-emu_instr_table - dc.w emu_op_07-emu_instr_table - dc.w emu_op_08-emu_instr_table - dc.w emu_op_09-emu_instr_table - dc.w emu_op_0a-emu_instr_table - dc.w emu_op_0b-emu_instr_table - dc.w emu_op_0c-emu_instr_table - dc.w emu_op_0d-emu_instr_table - dc.w emu_op_0e-emu_instr_table - dc.w emu_op_0f-emu_instr_table - dc.w emu_op_10-emu_instr_table - dc.w emu_op_11-emu_instr_table - dc.w emu_op_12-emu_instr_table - dc.w emu_op_13-emu_instr_table - dc.w emu_op_14-emu_instr_table - dc.w emu_op_15-emu_instr_table - dc.w emu_op_16-emu_instr_table - dc.w emu_op_17-emu_instr_table - dc.w emu_op_18-emu_instr_table - dc.w emu_op_19-emu_instr_table - dc.w emu_op_1a-emu_instr_table - dc.w emu_op_1b-emu_instr_table - dc.w emu_op_1c-emu_instr_table - dc.w emu_op_1d-emu_instr_table - dc.w emu_op_1e-emu_instr_table - dc.w emu_op_1f-emu_instr_table - dc.w emu_op_20-emu_instr_table - dc.w emu_op_21-emu_instr_table - dc.w emu_op_22-emu_instr_table - dc.w emu_op_23-emu_instr_table - dc.w emu_op_24-emu_instr_table - dc.w emu_op_25-emu_instr_table - dc.w emu_op_26-emu_instr_table - dc.w emu_op_27-emu_instr_table - dc.w emu_op_28-emu_instr_table - dc.w emu_op_29-emu_instr_table - dc.w emu_op_2a-emu_instr_table - dc.w emu_op_2b-emu_instr_table - dc.w emu_op_2c-emu_instr_table - dc.w emu_op_2d-emu_instr_table - dc.w emu_op_2e-emu_instr_table - dc.w emu_op_2f-emu_instr_table - dc.w emu_op_30-emu_instr_table - dc.w emu_op_31-emu_instr_table - dc.w emu_op_32-emu_instr_table - dc.w emu_op_33-emu_instr_table - dc.w emu_op_34-emu_instr_table - dc.w emu_op_35-emu_instr_table - dc.w emu_op_36-emu_instr_table - dc.w emu_op_37-emu_instr_table - dc.w emu_op_38-emu_instr_table - dc.w emu_op_39-emu_instr_table - dc.w emu_op_3a-emu_instr_table - dc.w emu_op_3b-emu_instr_table - dc.w emu_op_3c-emu_instr_table - dc.w emu_op_3d-emu_instr_table - dc.w emu_op_3e-emu_instr_table - dc.w emu_op_3f-emu_instr_table - dc.w emu_op_40-emu_instr_table - dc.w emu_op_41-emu_instr_table - dc.w emu_op_42-emu_instr_table - dc.w emu_op_43-emu_instr_table - dc.w emu_op_44-emu_instr_table - dc.w emu_op_45-emu_instr_table - dc.w emu_op_46-emu_instr_table - dc.w emu_op_47-emu_instr_table - dc.w emu_op_48-emu_instr_table - dc.w emu_op_49-emu_instr_table - dc.w emu_op_4a-emu_instr_table - dc.w emu_op_4b-emu_instr_table - dc.w emu_op_4c-emu_instr_table - dc.w emu_op_4d-emu_instr_table - dc.w emu_op_4e-emu_instr_table - dc.w emu_op_4f-emu_instr_table - dc.w emu_op_50-emu_instr_table - dc.w emu_op_51-emu_instr_table - dc.w emu_op_52-emu_instr_table - dc.w emu_op_53-emu_instr_table - dc.w emu_op_54-emu_instr_table - dc.w emu_op_55-emu_instr_table - dc.w emu_op_56-emu_instr_table - dc.w emu_op_57-emu_instr_table - dc.w emu_op_58-emu_instr_table - dc.w emu_op_59-emu_instr_table - dc.w emu_op_5a-emu_instr_table - dc.w emu_op_5b-emu_instr_table - dc.w emu_op_5c-emu_instr_table - dc.w emu_op_5d-emu_instr_table - dc.w emu_op_5e-emu_instr_table - dc.w emu_op_5f-emu_instr_table - dc.w emu_op_60-emu_instr_table - dc.w emu_op_61-emu_instr_table - dc.w emu_op_62-emu_instr_table - dc.w emu_op_63-emu_instr_table - dc.w emu_op_64-emu_instr_table - dc.w emu_op_65-emu_instr_table - dc.w emu_op_66-emu_instr_table - dc.w emu_op_67-emu_instr_table - dc.w emu_op_68-emu_instr_table - dc.w emu_op_69-emu_instr_table - dc.w emu_op_6a-emu_instr_table - dc.w emu_op_6b-emu_instr_table - dc.w emu_op_6c-emu_instr_table - dc.w emu_op_6d-emu_instr_table - dc.w emu_op_6e-emu_instr_table - dc.w emu_op_6f-emu_instr_table - dc.w emu_op_70-emu_instr_table - dc.w emu_op_71-emu_instr_table - dc.w emu_op_72-emu_instr_table - dc.w emu_op_73-emu_instr_table - dc.w emu_op_74-emu_instr_table - dc.w emu_op_75-emu_instr_table - dc.w emu_op_76-emu_instr_table - dc.w emu_op_77-emu_instr_table - dc.w emu_op_78-emu_instr_table - dc.w emu_op_79-emu_instr_table - dc.w emu_op_7a-emu_instr_table - dc.w emu_op_7b-emu_instr_table - dc.w emu_op_7c-emu_instr_table - dc.w emu_op_7d-emu_instr_table - dc.w emu_op_7e-emu_instr_table - dc.w emu_op_7f-emu_instr_table - dc.w emu_op_80-emu_instr_table - dc.w emu_op_81-emu_instr_table - dc.w emu_op_82-emu_instr_table - dc.w emu_op_83-emu_instr_table - dc.w emu_op_84-emu_instr_table - dc.w emu_op_85-emu_instr_table - dc.w emu_op_86-emu_instr_table - dc.w emu_op_87-emu_instr_table - dc.w emu_op_88-emu_instr_table - dc.w emu_op_89-emu_instr_table - dc.w emu_op_8a-emu_instr_table - dc.w emu_op_8b-emu_instr_table - dc.w emu_op_8c-emu_instr_table - dc.w emu_op_8d-emu_instr_table - dc.w emu_op_8e-emu_instr_table - dc.w emu_op_8f-emu_instr_table - dc.w emu_op_90-emu_instr_table - dc.w emu_op_91-emu_instr_table - dc.w emu_op_92-emu_instr_table - dc.w emu_op_93-emu_instr_table - dc.w emu_op_94-emu_instr_table - dc.w emu_op_95-emu_instr_table - dc.w emu_op_96-emu_instr_table - dc.w emu_op_97-emu_instr_table - dc.w emu_op_98-emu_instr_table - dc.w emu_op_99-emu_instr_table - dc.w emu_op_9a-emu_instr_table - dc.w emu_op_9b-emu_instr_table - dc.w emu_op_9c-emu_instr_table - dc.w emu_op_9d-emu_instr_table - dc.w emu_op_9e-emu_instr_table - dc.w emu_op_9f-emu_instr_table - dc.w emu_op_a0-emu_instr_table - dc.w emu_op_a1-emu_instr_table - dc.w emu_op_a2-emu_instr_table - dc.w emu_op_a3-emu_instr_table - dc.w emu_op_a4-emu_instr_table - dc.w emu_op_a5-emu_instr_table - dc.w emu_op_a6-emu_instr_table - dc.w emu_op_a7-emu_instr_table - dc.w emu_op_a8-emu_instr_table - dc.w emu_op_a9-emu_instr_table - dc.w emu_op_aa-emu_instr_table - dc.w emu_op_ab-emu_instr_table - dc.w emu_op_ac-emu_instr_table - dc.w emu_op_ad-emu_instr_table - dc.w emu_op_ae-emu_instr_table - dc.w emu_op_af-emu_instr_table - dc.w emu_op_b0-emu_instr_table - dc.w emu_op_b1-emu_instr_table - dc.w emu_op_b2-emu_instr_table - dc.w emu_op_b3-emu_instr_table - dc.w emu_op_b4-emu_instr_table - dc.w emu_op_b5-emu_instr_table - dc.w emu_op_b6-emu_instr_table - dc.w emu_op_b7-emu_instr_table - dc.w emu_op_b8-emu_instr_table - dc.w emu_op_b9-emu_instr_table - dc.w emu_op_ba-emu_instr_table - dc.w emu_op_bb-emu_instr_table - dc.w emu_op_bc-emu_instr_table - dc.w emu_op_bd-emu_instr_table - dc.w emu_op_be-emu_instr_table - dc.w emu_op_bf-emu_instr_table - dc.w emu_op_c0-emu_instr_table - dc.w emu_op_c1-emu_instr_table - dc.w emu_op_c2-emu_instr_table - dc.w emu_op_c3-emu_instr_table - dc.w emu_op_c4-emu_instr_table - dc.w emu_op_c5-emu_instr_table - dc.w emu_op_c6-emu_instr_table - dc.w emu_op_c7-emu_instr_table - dc.w emu_op_c8-emu_instr_table - dc.w emu_op_c9-emu_instr_table - dc.w emu_op_ca-emu_instr_table - dc.w emu_op_cb-emu_instr_table - dc.w emu_op_cc-emu_instr_table - dc.w emu_op_cd-emu_instr_table - dc.w emu_op_ce-emu_instr_table - dc.w emu_op_cf-emu_instr_table - dc.w emu_op_d0-emu_instr_table - dc.w emu_op_d1-emu_instr_table - dc.w emu_op_d2-emu_instr_table - dc.w emu_op_d3-emu_instr_table - dc.w emu_op_d4-emu_instr_table - dc.w emu_op_d5-emu_instr_table - dc.w emu_op_d6-emu_instr_table - dc.w emu_op_d7-emu_instr_table - dc.w emu_op_d8-emu_instr_table - dc.w emu_op_d9-emu_instr_table - dc.w emu_op_da-emu_instr_table - dc.w emu_op_db-emu_instr_table - dc.w emu_op_dc-emu_instr_table - dc.w emu_op_dd-emu_instr_table - dc.w emu_op_de-emu_instr_table - dc.w emu_op_df-emu_instr_table - dc.w emu_op_e0-emu_instr_table - dc.w emu_op_e1-emu_instr_table - dc.w emu_op_e2-emu_instr_table - dc.w emu_op_e3-emu_instr_table - dc.w emu_op_e4-emu_instr_table - dc.w emu_op_e5-emu_instr_table - dc.w emu_op_e6-emu_instr_table - dc.w emu_op_e7-emu_instr_table - dc.w emu_op_e8-emu_instr_table - dc.w emu_op_e9-emu_instr_table - dc.w emu_op_ea-emu_instr_table - dc.w emu_op_eb-emu_instr_table - dc.w emu_op_ec-emu_instr_table - dc.w emu_op_ed-emu_instr_table - dc.w emu_op_ee-emu_instr_table - dc.w emu_op_ef-emu_instr_table - dc.w emu_op_f0-emu_instr_table - dc.w emu_op_f1-emu_instr_table - dc.w emu_op_f2-emu_instr_table - dc.w emu_op_f3-emu_instr_table - dc.w emu_op_f4-emu_instr_table - dc.w emu_op_f5-emu_instr_table - dc.w emu_op_f6-emu_instr_table - dc.w emu_op_f7-emu_instr_table - dc.w emu_op_f8-emu_instr_table - dc.w emu_op_f9-emu_instr_table - dc.w emu_op_fa-emu_instr_table - dc.w emu_op_fb-emu_instr_table - dc.w emu_op_fc-emu_instr_table - dc.w emu_op_fd-emu_instr_table - dc.w emu_op_fe-emu_instr_table - dc.w emu_op_ff-emu_instr_table - - ;;; http://z80.info/z80oplist.txt + +emu_plain_op: emu_op_00: ;; NOP + START DONE emu_op_01: ;; LD BC,immed.w ;; Read a word and put it in BC ;; No flags + START FETCHWI d4 DONE @@ -454,12 +226,14 @@ emu_op_02: ;; LD (BC),A ;; XXX Do this ;; No flags + START DONE emu_op_03: ;; INC BC ;; BC <- BC+1 ;; No flags + START addq.w #1,d4 DONE @@ -467,6 +241,7 @@ emu_op_04: ;; INC B ;; B <- B+1 ;; No flags ? + START add.w #$0100,d4 ; 8 DONE ; 8 ;16 cycles @@ -475,6 +250,7 @@ emu_op_05: ;; DEC B ;; B <- B-1 ;; Flags: S,Z,H changed, P=oVerflow, N set, C left + START sub.w #$0100,d4 DONE @@ -482,6 +258,7 @@ emu_op_06: ;; LD B,immed.b ;; Read a byte and put it in B ;; No flags + START LOHI d4 FETCHBI d4 HILO d4 @@ -491,12 +268,14 @@ emu_op_07: ;; RLCA ;; Rotate A left, carry bit gets top bit ;; Flags: H,N=0; C aff. + START rol.b d3,1 DONE emu_op_08: ;; EX AF,AF' ;; No flags + START swap d3 DONE @@ -504,6 +283,7 @@ emu_op_09: ;; ADD HL,BC ;; HL <- HL+BC ;; Flags: H, C aff.; N=0 + START add.w d4,d6 DONE @@ -511,6 +291,7 @@ emu_op_0a: ;; LD A,(BC) ;; A <- (BC) ;; No flags + START FETCHB d4 move.b d1,d3 DONE @@ -519,6 +300,7 @@ emu_op_0b: ;; DEC BC ;; BC <- BC-1 ;; No flags + START subq.w #1,d4 DONE @@ -526,6 +308,7 @@ emu_op_0c: ;; INC C ;; C <- C+1 ;; Flags: S,Z,H aff.; P=overflow, N=0 + START addq.b #1,d4 DONE @@ -533,12 +316,14 @@ emu_op_0d: ;; DEC C ;; C <- C-1 ;; Flags: S,Z,H aff., P=overflow, N=1 + START subq.b #1,d4 DONE emu_op_0e: ;; LD C,immed.b ;; No flags + START FETCHBI d4 DONE @@ -546,6 +331,7 @@ emu_op_0f: ;; RRCA ;; Rotate A right, carry bit gets top bit ;; Flags: H,N=0; C aff. + START ror.b d3,1 DONE @@ -555,36 +341,41 @@ emu_op_10: ;; and branch by immed.b ;; if B not zero ;; No flags + START LOHI d4 subq.b #1,d4 - beq emu_op_10_end ; slooooow + beq end ; slooooow FETCHBI d1 add.w d1,d2 -emu_op_10_end: +\end: HILO d4 DONE emu_op_11: ;; LD DE,immed.w ;; No flags + START FETCHWI d5 DONE emu_op_12: ;; LD (DE),A ;; No flags + START move.b (a0,d5.w),d3 DONE emu_op_13: ;; INC DE ;; No flags + START addq.w #1,d5 DONE emu_op_14: ;; INC D ;; Flags: S,Z,H aff.; P=overflow, N=0 + START LOHI d5 addq.b #1,d5 HILO d5 @@ -593,6 +384,7 @@ emu_op_14: emu_op_15: ;; DEC D ;; Flags: S,Z,H aff.; P=overflow, N=1 + START LOHI d5 subq.b #1,d5 HILO d5 @@ -601,6 +393,7 @@ emu_op_15: emu_op_16: ;; LD D,immed.b ;; No flags + START LOHI d5 FETCHBI d5 HILO d5 @@ -609,6 +402,7 @@ emu_op_16: emu_op_17: ;; RLA ;; Flags: P,N=0; C aff. + START roxl.b 1,d3 DONE @@ -616,6 +410,7 @@ emu_op_18: ;; JR ;; Branch relative by a signed immediate byte ;; No flags + START FETCHBI d1 add.w d1,d2 DONE @@ -624,6 +419,7 @@ emu_op_19: ;; ADD HL,DE ;; HL <- HL+DE ;; Flags: H,C aff,; N=0 + START add.w d5,d6 DONE @@ -631,36 +427,42 @@ emu_op_1a: ;; LD A,(DE) ;; A <- (DE) ;; No flags + START FETCHB d5,d3 DONE emu_op_1b: ;; DEC DE ;; No flags + START subq.w #1,d5 DONE emu_op_1c: ;; INC E ;; Flags: S,Z,H aff.; P=overflow; N=0 + START addq.b #1,d5 DONE emu_op_1d: ;; DEC E ;; Flags: S,Z,H aff.; P=overflow, N=1 + START subq.b #1,d5 DONE emu_op_1e: ;; LD E,immed.b ;; No flags + START FETCHBI d5 DONE emu_op_1f: ;; RRA ;; Flags: H,N=0; C aff. + START roxr.b d3 DONE @@ -670,15 +472,17 @@ emu_op_20: ;; PC <- PC+immed.b ;; SPEED can be made faster ;; No flags - beq emu_op_10_end + START + beq end FETCHBI d1 add.w d1,d2 -emu_op_10_end: +\end: DONE emu_op_21: ;; LD HL,immed.w ;; No flags + START FETCHWI d6 DONE @@ -686,18 +490,21 @@ emu_op_22: ;; LD immed.w,HL ;; (address) <- HL ;; No flags + START FETCHWI d1 PUTW d6,d1 emu_op_23: ;; INC HL ;; No flags + START addq.w #1,d6 DONE emu_op_24: ;; INC H ;; Flags: S,Z,H aff.; P=overflow, N=0 + START LOHI d6 addq.b #1,d6 HILO d6 @@ -706,6 +513,7 @@ emu_op_24: emu_op_25: ;; DEC H ;; Flags: S,Z,H aff.; P=overflow, N=1 + START LOHI d6 subq.b #1,d6 HILO d6 @@ -714,6 +522,7 @@ emu_op_25: emu_op_26: ;; LD H,immed.b ;; No flags + START LOHI d6 FETCHBI d6 HILO d6 @@ -725,6 +534,7 @@ emu_op_27: ;; http://www.z80.info/z80syntx.htm#DAA ;; Flags: oh lord they're fucked up ;; XXX DO THIS + START DONE @@ -734,48 +544,56 @@ emu_op_28: ;; PC <- PC+immed.b ;; SPEED can be made faster ;; No flags - beq emu_op_28_end + START + beq end FETCHBI d1 add.w d1,d2 -emu_op_28_end: +\end: DONE emu_op_29: ;; ADD HL,HL ;; Flags: + START add.w d6,d6 DONE emu_op_2a: ;; LD HL,(immed.w) ;; address is absolute + START FETCHWI d1 FETCHW d1,d6 DONE emu_op_2b: ;; DEC HL + START subq.w #1,d6 DONE emu_op_2c: ;; INC L + START addq.b #1,d6 DONE emu_op_2d: ;; DEC L + START subq.b #1,d6 DONE emu_op_2e: ;; LD L,immed.b + START FETCHBI d6 DONE emu_op_2f: ;; CPL ;; A <- NOT A + START not.b d3 DONE @@ -783,14 +601,17 @@ emu_op_30: ;; JR NC,immed.b ;; If carry clear ;; PC <- PC+immed.b - bcs emu_op_30_end + ;; XXX finish + START + bcs end FETCHBI d1 add.w d1,d2 -emu_op_30_end: +\end: DONE emu_op_31: ;; LD SP,immed.w + START swap d2 FETCHWI d2 swap d2 @@ -799,6 +620,7 @@ emu_op_31: emu_op_32: ;; LD (immed.w),A ;; store indirect + START FETCHWI d1 PUTB d3,d1 DONE @@ -806,6 +628,7 @@ emu_op_32: emu_op_33: ;; INC SP ;; XXX This might be done by adding $100 + START swap d2 addq.w #1,d2 swap d2 @@ -815,6 +638,7 @@ emu_op_34: ;; INC (HL) ;; Increment byte ;; SPEED can be made faster + START FETCHB d6 addq.b #1,d1 PUTB d1,d6 @@ -824,6 +648,7 @@ emu_op_35: ;; DEC (HL) ;; Decrement byte ;; SPEED can be made faster + START FETCHB d6 subq.b #1,d1 PUTB d1,d6 @@ -831,6 +656,7 @@ emu_op_35: emu_op_36: ;; LD (HL),immed.b + START FETCHBI d1 PUTB d6,d1 DONE @@ -839,21 +665,24 @@ emu_op_37: ;; SCF ;; Set Carry Flag ;; XXX DO THIS + START DONE emu_op_38: ;; JR C,immed.b ;; If carry set ;; PC <- PC+immed.b - bcc emu_op_38_end + START + bcc end FETCHBI d1 add.w d1,d2 -emu_op_38_end: +\end: DONE emu_op_39: ;; ADD HL,SP ;; HL <- HL+SP + START swap d2 add.w d6,d2 swap d2 @@ -861,6 +690,7 @@ emu_op_39: emu_op_3a: ;; LD A,(immed.w) + START FETCHWI d1 FETCHB d1,d3 DONE @@ -868,6 +698,7 @@ emu_op_3a: emu_op_3b: ;; DEC SP ;; XXX this might be done by subtracting $100 + START swap d2 subq.w #1,d2 swap d2 @@ -875,16 +706,19 @@ emu_op_3b: emu_op_3c: ;; INC A + START addq.b #1,d3 DONE emu_op_3d: ;; DEC A + START subq.b #1,d3 DONE emu_op_3e: ;; LD A,immed.b + START FETCHBI d3 DONE @@ -892,11 +726,13 @@ emu_op_3f: ;; CCF ;; Toggle carry flag ;; XXX DO THIS + START DONE emu_op_40: ;; LD B,B ;; SPEED + START LOHI d4 move.b d4,d4 HILO d4 @@ -905,6 +741,7 @@ emu_op_40: emu_op_41: ;; LD B,C ;; SPEED + START move.b d4,d1 LOHI d4 move.b d1,d4 @@ -914,26 +751,29 @@ emu_op_41: emu_op_42: ;; LD B,D ;; B <- D + START LOHI d4 ; 4 LOHI d5 ; 4 move.b d5,d4 ; 4 HILO d4 ; 4 HILO d5 ; 4 - DONE ; 8 - ;28 cycles + DONE + ;20 cycles emu_op_43: ;; LD B,E ;; B <- E + START LOHI d4 ; 4 move.b d4,d5 ; 4 HILO d4 ; 4 - DONE ; 8 - ; 20 cycles + DONE + ; 12 cycles emu_op_44: ;; LD B,H ;; B <- H + START LOHI d4 LOHI d6 move.b d6,d4 @@ -944,6 +784,7 @@ emu_op_44: emu_op_45: ;; LD B,L ;; B <- L + START LOHI d4 move.b d6,d4 HILO d4 @@ -952,6 +793,7 @@ emu_op_45: emu_op_46: ;; LD B,(HL) ;; B <- (HL) + START LOHI d4 FETCHB d6,d4 HILO d4 @@ -960,6 +802,7 @@ emu_op_46: emu_op_47: ;; LD B,A ;; B <- A + START LOHI d4 move.b d3,d4 HILO d4 @@ -968,17 +811,20 @@ emu_op_47: emu_op_48: ;; LD C,B ;; C <- B + START move.w d4,d1 ; 4 lsr.w #8,d1 ; 6 move.b d1,d4 ; 4 - DONE ; 8 - ;22 cycles + DONE + ;14 cycles emu_op_49: ;; LD C,C + START DONE emu_op_4a: ;; LD C,D + START move.w d5,d1 lsr.w #8,d1 move.b d1,d4 @@ -986,11 +832,13 @@ emu_op_4a: emu_op_4b: ;; LD C,E + START move.b d4,d5 DONE emu_op_4c: ;; LD C,H + START LOHI d6 move.b d4,d6 HILO d6 @@ -998,22 +846,26 @@ emu_op_4c: emu_op_4d: ;; LD C,L + START move.b d4,d6 DONE emu_op_4e: ;; LD C,(HL) ;; C <- (HL) + START FETCHB d6,d4 DONE emu_op_4f: ;; LD C,A + START move.b d3,d4 DONE emu_op_50: ;; LD D,B + START LOHI d4 LOHI d5 move.b d4,d5 @@ -1023,6 +875,7 @@ emu_op_50: emu_op_51: ;; LD D,C + START LOHI d5 move.b d4,d5 HILO d5 @@ -1030,10 +883,12 @@ emu_op_51: emu_op_52: ;; LD D,D + START DONE emu_op_53: ;; LD D,E + START andi.w #$00ff,d5 move.b d5,d1 lsl #8,d1 @@ -1042,16 +897,18 @@ emu_op_53: emu_op_54: ;; LD D,H + START LOHI d5 ; 4 LOHI d6 ; 4 move.b d6,d5 ; 4 HILO d5 ; 4 HILO d6 ; 4 - DONE ; 8 - ;28 cycles + DONE + ;20 cycles emu_op_55: ;; LD D,L + START LOHI d5 move.b d6,d5 HILO d5 @@ -1060,6 +917,7 @@ emu_op_55: emu_op_56: ;; LD D,(HL) ;; D <- (HL) + START LOHI d5 FETCHB d6,d5 HILO d5 @@ -1067,6 +925,7 @@ emu_op_56: emu_op_57: ;; LD D,A + START LOHI d5 move.b d3,d5 HILO d5 @@ -1074,6 +933,7 @@ emu_op_57: emu_op_58: ;; LD E,B + START LOHI d4 move.b d4,d5 HILO d4 @@ -1081,11 +941,13 @@ emu_op_58: emu_op_59: ;; LD E,C + START move.b d4,d5 DONE emu_op_5a: ;; LD E,D + START LOHI d5 move.b d5,d1 HILO d5 @@ -1102,10 +964,12 @@ emu_op_5a: emu_op_5b: ;; LD E,E + START DONE emu_op_5c: ;; LD E,H + START LOHI d6 move.b d5,d6 HILO d6 @@ -1113,21 +977,25 @@ emu_op_5c: emu_op_5d: ;; LD E,L + START move.b d5,d6 DONE emu_op_5e: ;; LD E,(HL) + START FETCHB d6,d1 DONE emu_op_5f: ;; LD E,A + START move.b d5,d3 DONE emu_op_60: ;; LD H,B + START LOHI d4 LOHI d6 move.b d6,d4 @@ -1137,6 +1005,7 @@ emu_op_60: emu_op_61: ;; LD H,C + START LOHI d6 move.b d4,d6 HILO d6 @@ -1144,6 +1013,7 @@ emu_op_61: emu_op_62: ;; LD H,D + START LOHI d5 LOHI d6 move.b d5,d6 @@ -1153,6 +1023,7 @@ emu_op_62: emu_op_63: ;; LD H,E + START LOHI d6 move.b d5,d6 HILO d6 @@ -1160,11 +1031,13 @@ emu_op_63: emu_op_64: ;; LD H,H + START DONE emu_op_65: ;; LD H,L ;; H <- L + START move.b d6,d1 LOHI d6 move.b d1,d6 @@ -1173,6 +1046,7 @@ emu_op_65: emu_op_66: ;; LD H,(HL) + START FETCHB d6,d1 LOHI d6 move.b d1,d6 @@ -1181,6 +1055,7 @@ emu_op_66: emu_op_67: ;; LD H,A + START LOHI d6 move.b d3,d6 HILO d6 @@ -1188,6 +1063,7 @@ emu_op_67: emu_op_68: ;; LD L,B + START LOHI d4 move.b d4,d6 HILO d4 @@ -1195,11 +1071,13 @@ emu_op_68: emu_op_69: ;; LD L,C + START move.b d4,d6 DONE emu_op_6a: ;; LD L,D + START LOHI d5 move.b d5,d6 HILO d5 @@ -1207,11 +1085,13 @@ emu_op_6a: emu_op_6b: ;; LD L,E + START move.b d5,d6 DONE emu_op_6c: ;; LD L,H + START LOHI d6 move.b d6,d1 HILO d6 @@ -1220,21 +1100,25 @@ emu_op_6c: emu_op_6d: ;; LD L,L + START DONE emu_op_6e: ;; LD L,(HL) ;; L <- (HL) + START FETCHB d6,d6 DONE emu_op_6f: ;; LD L,A + START move.b d3,d6 DONE emu_op_70: ;; LD (HL),B + START LOHI d4 PUTB d6,d4 HILO d4 @@ -1242,11 +1126,13 @@ emu_op_70: emu_op_71: ;; LD (HL),C + START PUTB d6,d4 DONE emu_op_72: ;; LD (HL),D + START LOHI d5 PUTB d6,d5 HILO d5 @@ -1254,11 +1140,13 @@ emu_op_72: emu_op_73: ;; LD (HL),E + START PUTB d6,d5 DONE emu_op_74: ;; LD (HL),H + START move.w d6,d1 HILO d1 PUTB d1,d6 @@ -1266,6 +1154,7 @@ emu_op_74: emu_op_75: ;; LD (HL),L + START move.b d6,d1 PUTB d1,d6 DONE @@ -1273,15 +1162,18 @@ emu_op_75: emu_op_76: ;; HALT ;; XXX do this + START DONE emu_op_77: ;; LD (HL),A + START PUTB d3,d6 DONE emu_op_78: ;; LD A,B + START move.w d4,d1 LOHI d1 move.b d1,d3 @@ -1289,11 +1181,13 @@ emu_op_78: emu_op_79: ;; LD A,C + START move.b d4,d3 DONE emu_op_7a: ;; LD A,D + START move.w d5,d1 LOHI d1 move.b d1,d3 @@ -1301,11 +1195,13 @@ emu_op_7a: emu_op_7b: ;; LD A,E + START move.b d5,d3 DONE emu_op_7c: ;; LD A,H + START move.w d6,d1 LOHI d1 move.b d1,d3 @@ -1313,21 +1209,25 @@ emu_op_7c: emu_op_7d: ;; LD A,L + START move.b d6,d3 DONE emu_op_7e: ;; LD A,(HL) ;; A <- (HL) + START FETCHB d6,d3 DONE emu_op_7f: ;; LD A,A + START DONE emu_op_80: ;; ADD A,B + START LOHI d4 F_ADD_B d4,d3 add.b d4,d3 @@ -1336,12 +1236,14 @@ emu_op_80: emu_op_81: ;; ADD A,C + START F_ADD_B d4,d3 add.b d4,d3 DONE emu_op_82: ;; ADD A,D + START LOHI d5 F_ADD_B d5,d3 add.b d5,d3 @@ -1350,12 +1252,14 @@ emu_op_82: emu_op_83: ;; ADD A,E + START F_ADD_B d5,d3 add.b d5,d3 DONE emu_op_84: ;; ADD A,H + START LOHI d6 F_ADD_B d6,d3 add.b d6,d3 @@ -1364,12 +1268,14 @@ emu_op_84: emu_op_85: ;; ADD A,L + START F_ADD_B d6,d3 add.b d6,d3 DONE emu_op_86: ;; ADD A,(HL) + START FETCHB d6,d1 F_ADD_B d1,d3 add.b d1,d3 @@ -1377,6 +1283,7 @@ emu_op_86: emu_op_87: ;; ADD A,A + START F_ADD_B d3,d3 add.b d3,d3 DONE @@ -1385,6 +1292,7 @@ emu_op_88: ;; ADC A,B ;; A <- A + B + (carry) ;; XXX fix this shit up + START LOHI d4 addx.b d4,d3 HILO d4 @@ -1394,12 +1302,14 @@ emu_op_89: ;; ADC A,C ;; A <- A + C + (carry) ;; XXX fix this shit up + START addx.b d4,d3 DONE emu_op_8a: ;; ADC A,D ;; XXX fix this shit up + START LOHI d5 addx.b d5,d3 HILO d5 |