diff --git a/src/ce/atomic_load_32.src b/src/ce/atomic_load_32.src index d7b149d8e..d219bed47 100644 --- a/src/ce/atomic_load_32.src +++ b/src/ce/atomic_load_32.src @@ -17,7 +17,7 @@ _atomic_load_32: ; getting caught in an endless loop of the value changing between reads with a ; fixed period equal to the amount of time it takes for each retry inc c - ld b,c + ld b, c .L.wait: djnz .L.wait ; Read the value twice. diff --git a/src/ce/debug.src b/src/ce/debug.src index 1136a04ce..8c1618787 100644 --- a/src/ce/debug.src +++ b/src/ce/debug.src @@ -6,11 +6,11 @@ _dbg_Debugger: scf - sbc hl,hl - ld (hl),2 + sbc hl, hl + ld (hl), 2 ret - .section .text._dbg_WatchpointSet + .section .text._dbg_WatchpointSet .global _dbg_WatchpointSet .type _dbg_WatchpointSet, @function @@ -46,7 +46,7 @@ _dbg_WatchpointSet: ld (hl), 3 ret - .section .text._dbg_WatchpointRemoveAll + .section .text._dbg_WatchpointRemoveAll .global _dbg_WatchpointRemoveAll .type _dbg_WatchpointRemoveAll, @function diff --git a/src/ce/eval.src b/src/ce/eval.src index 2b0738d2e..349ea22e2 100644 --- a/src/ce/eval.src +++ b/src/ce/eval.src @@ -67,7 +67,7 @@ _os_Eval: call $20F30 ; stoans call $2079C ; pop error handler xor a, a - .L_os_Eval.error: +.L_os_Eval.error: pop de push af call $20E80 ; fixtempcnt diff --git a/src/ce/getstringinput.src b/src/ce/getstringinput.src index afac0e45c..59b944723 100644 --- a/src/ce/getstringinput.src +++ b/src/ce/getstringinput.src @@ -142,7 +142,7 @@ _os_GetStringInput: sbc hl, bc ; decrement and compare to buf start add hl, bc jr nz, .L.clear_loop - ex de,hl + ex de, hl ld (ti.curRow), hl jp .L.start diff --git a/src/ce/random.src b/src/ce/random.src index ca4a7142a..1dfb326b7 100644 --- a/src/ce/random.src +++ b/src/ce/random.src @@ -136,4 +136,4 @@ __setstate: .section .data .local __state __state: - .d32 0d0e0f10h,090a0b0ch,05060708h,01020304h + .d32 0d0e0f10h,090a0b0ch,05060708h,01020304h diff --git a/src/ce/runprgm.src b/src/ce/runprgm.src index f5d54979a..898684e38 100644 --- a/src/ce/runprgm.src +++ b/src/ce/runprgm.src @@ -177,7 +177,7 @@ _os_RunPrgm: ; relocated functions ; --------------------------------------------------------------- - .section .runprgm.reloc, "awx", @progbits + .section .runprgm.reloc, "awx", @progbits launch_asm_prgm: call delete_running_prgm call setup_prgm_state @@ -249,7 +249,7 @@ setup_temp_parser_hook: jr nz, .L.chain_hook .L.no_chain: ld hl, stub.chain - ld (hl), 0xAF ; xor a,a + ld (hl), 0xAF ; xor a, a inc hl ld (hl), 0xC9 ; ret ret @@ -312,7 +312,7 @@ push_stub: ld hl, 0 .equ push_stub.prev_sp, $-3 push hl - ld hl,0 + ld hl, 0 .equ push_stub.data_size, $-3 push hl ld hl, 0 @@ -412,7 +412,7 @@ stub.hook_parser: jp z, ti.JError ld a, 2 stub.chain: - jp 0 ; xor a,a \ ret if not chaining + jp 0 ; xor a, a \ ret if not chaining .L.found: call ti.ChkInRam ex de, hl @@ -430,7 +430,7 @@ stub.chain: ld bc, (ti.asm_prgm_size) ld de, ti.userMem ldir - ld de,0 + ld de, 0 .equ stub.callback, $-3 pop bc ; data size pop hl ; data diff --git a/src/ce/sleep_common.src b/src/ce/sleep_common.src index 5a0f306c1..7407f8610 100644 --- a/src/ce/sleep_common.src +++ b/src/ce/sleep_common.src @@ -1,4 +1,4 @@ - .assume adl=1 + .assume adl=1 .section .text .global ___sleep_common .type ___sleep_common, @function @@ -40,7 +40,7 @@ ___sleep_common.3: ld a, e ; auhl = now pop de pop bc ; dubc = end -; or a, a +; or a, a sbc hl, bc sbc a, e ; auhl = now - end ; ^ 48 cc diff --git a/src/ce/zx0.src b/src/ce/zx0.src index 9acaaa6ca..edcd2abca 100644 --- a/src/ce/zx0.src +++ b/src/ce/zx0.src @@ -104,7 +104,7 @@ dzx0t_elias_loop: add a, a jr nc, dzx0t_elias_loop ret nz - ld a, (hl) ; load another group of 8 bits + ld a, (hl) ; load another group of 8 bits inc hl rla jr nc, dzx0t_elias_loop diff --git a/src/crt/bbitrev.src b/src/crt/bbitrev.src index d075bcf79..329db84aa 100644 --- a/src/crt/bbitrev.src +++ b/src/crt/bbitrev.src @@ -6,20 +6,20 @@ __bbitrev: push bc - ld b,a ; b=ABCDEFGH - rrca ; a=HABCDEFG - rrca ; a=GHABCDEF + ld b,a ; b=ABCDEFGH + rrca ; a=HABCDEFG + rrca ; a=GHABCDEF xor a,b and a,$aa - xor a,b ; a=GBADCFEH - ld b,a ; b=GBADCFEH - rrca ; a=HGBADCFE - rrca ; a=EHGBADCF - rrca ; a=FEHGBADC - rrca ; a=CFEHGBAD + xor a,b ; a=GBADCFEH + ld b,a ; b=GBADCFEH + rrca ; a=HGBADCFE + rrca ; a=EHGBADCF + rrca ; a=FEHGBADC + rrca ; a=CFEHGBAD xor a,b and a,$66 - xor a,b ; a=GFEDCBAH - rrca ; a=HGFEDCBA + xor a,b ; a=GFEDCBAH + rrca ; a=HGFEDCBA pop bc ret diff --git a/src/crt/crt.src b/src/crt/crt.src index b3ecb5db6..45cf11776 100644 --- a/src/crt/crt.src +++ b/src/crt/crt.src @@ -2,17 +2,17 @@ .section .init.weak_crt,"ax",@progbits - ; hacks to get the icon and description to be included, - ; since the real crt overrides the weak + ; hacks to get the icon and description to be included, + ; since the real crt overrides the weak - .weak __start + .weak __start __start: - ld hl, ___description - ld hl, ___icon - ld hl, _main - ld hl, ___main_argc_argv + ld hl, ___description + ld hl, ___icon + ld hl, _main + ld hl, ___main_argc_argv - .extern ___main_argc_argv - .extern _main - .extern ___icon - .extern ___description + .extern ___main_argc_argv + .extern _main + .extern ___icon + .extern ___description diff --git a/src/crt/crt0.S b/src/crt/crt0.S index 1293d439a..12b4c7ce1 100644 --- a/src/crt/crt0.S +++ b/src/crt/crt0.S @@ -71,8 +71,8 @@ __start: call ti.ResetStacks ld bc, ___data_len or a, a - sbc hl, hl - adc hl, bc + sbc hl, hl + adc hl, bc jr z, .L.skip_data_copy ld hl, ___data_lma ld de, ___data_vma @@ -82,9 +82,9 @@ __start: ld de, (ti.asm_prgm_size) ld hl, ti.userMem call ti.DelMem - or a,a - sbc hl,hl - ld (ti.asm_prgm_size),hl + or a, a + sbc hl, hl + ld (ti.asm_prgm_size), hl ld hl, ti.pixelShadow ld bc, 8400 * 3 call ti.MemClear @@ -155,7 +155,7 @@ __start: call ti.HomeUp ld hl, __missingappvar call ti.PutS - call ti.NewLine + call ti.NewLine ld hl, __webaddress call ti.PutS jp ti.GetKey @@ -212,7 +212,7 @@ ___libload_libs_ret: ld hl, ti.OP1 + 1 call ti.Mov8b ld a, d ; Lspace - ld (de),a + ld (de), a inc de push de call ti.AnsName @@ -305,7 +305,7 @@ ___libload_libs_ret: jr .L.init_array_start .L.init_array_loop: push hl - ld hl, (hl) + ld hl, (hl) call __indcallhl pop hl inc hl @@ -370,7 +370,7 @@ _exit: dec hl dec hl push hl - ld hl, (hl) + ld hl, (hl) call __indcallhl pop hl .L.fini_array_start: diff --git a/src/crt/daddsub.src b/src/crt/daddsub.src index 2bfb44875..f40a34075 100644 --- a/src/crt/daddsub.src +++ b/src/crt/daddsub.src @@ -34,7 +34,7 @@ __daddsub: push de push hl ; pass x by value - xor a, (iy + 7) + xor a, (iy + 7) rla jr nc, .L.__daddmags ; same signs diff --git a/src/crt/drem.src b/src/crt/drem.src index 699c7e32f..34cc81fad 100644 --- a/src/crt/drem.src +++ b/src/crt/drem.src @@ -7,27 +7,27 @@ ; float64_t f64_rem(bool, float64_t, const float64_t*) __drem: - push af -push iy + push af + push iy ld iy, 9 add iy, sp - push iy - push bc - push de - push hl + push iy + push bc + push de + push hl rl b push af ; Carry = signbit(x) call ___f64_rem - pop af - pop af - pop af - pop af - pop af - pop iy - pop af ; restore + pop af + pop af + pop af + pop af + pop af + pop iy + pop af ; restore ret .extern ___f64_rem diff --git a/src/crt/fpneg.src b/src/crt/fpneg.src index 58ad8e32f..79cd2c256 100644 --- a/src/crt/fpneg.src +++ b/src/crt/fpneg.src @@ -1,13 +1,13 @@ ;-------------------------------------------------------------- ; -; Code Generation Helper +; Code Generation Helper ; For the Zilog eZ80 C Compiler -; Copyright 1992-2008 Zilog, Inc. +; Copyright 1992-2008 Zilog, Inc. ; ;-------------------------------------------------------------- ;-------------------------------------------------------------- ; -; IEEE Negate. +; IEEE Negate. ; ; INPUTS: ; AuBC: 32-bit IEEE Single Precision. diff --git a/src/crt/fpupop2.src b/src/crt/fpupop2.src index 4837b3027..0a50f0d02 100644 --- a/src/crt/fpupop2.src +++ b/src/crt/fpupop2.src @@ -5,7 +5,7 @@ .type __fpupop2, @function __fpupop2: - push bc + push bc ld bc, 0800000h add hl, bc jr nc, .ncarry diff --git a/src/crt/frem.src b/src/crt/frem.src index 08e8ec28a..bf9ecfc92 100644 --- a/src/crt/frem.src +++ b/src/crt/frem.src @@ -7,26 +7,26 @@ ; wraps _fmodf __frem: - push iy - push de - push hl + push iy + push de + push hl - push de - push hl ; y + push de + push hl ; y ld e, a push de ; x_hi8 push bc ; x_lo24 call _fmodf - pop bc - pop bc - pop bc - pop bc + pop bc + pop bc + pop bc + pop bc ld a, e ex (sp), hl - pop bc - pop de - pop iy + pop bc + pop de + pop iy ret .extern _fmodf diff --git a/src/crt/frimuls.src b/src/crt/frimuls.src index b208b34f8..e1c01ff3e 100644 --- a/src/crt/frimuls.src +++ b/src/crt/frimuls.src @@ -35,15 +35,15 @@ _L1: ex de,hl call __frimulu push hl - ex de,hl + ex de,hl ld hl,2 add hl,sp - rr (hl) + rr (hl) rr d rr e - pop hl - ld h,d - ld l,e + pop hl + ld h,d + ld l,e ;; ;; Check signs ;; diff --git a/src/crt/ftod.src b/src/crt/ftod.src index 1da01b63a..2a640d559 100644 --- a/src/crt/ftod.src +++ b/src/crt/ftod.src @@ -2,7 +2,7 @@ .section .text - .global __ftod + .global __ftod .type __ftod, @function ; input E:UHL (float) diff --git a/src/crt/ftoll.src b/src/crt/ftoll.src index 5201fddab..c7389a1ed 100644 --- a/src/crt/ftoll.src +++ b/src/crt/ftoll.src @@ -12,13 +12,13 @@ __ftoll: __ftoull: ld d, a - push iy -push de -push hl + push iy + push de + push hl call __ftoll_c - pop af -pop af -pop iy + pop af + pop af + pop iy ret .extern __ftoll_c diff --git a/src/crt/imulu.src b/src/crt/imulu.src index c7e9719e8..10972b9cd 100644 --- a/src/crt/imulu.src +++ b/src/crt/imulu.src @@ -48,7 +48,7 @@ Mul_UHL_UBC_UHL: ;--------------+---------------+---------------+-------------- add a, h ; a=(H*C>>8)+HLU*C+H*B+L*BCU ld h, a ; uhl=H*C+(HLU*C+H*B+L*BCU<<8)&0xFFFF ld a, e ; a=L - ld d, b ; de=BL + ld d, b ; de=BL mlt de ; ude=L*B add hl, de ; uhl=L*B+(H*C+(HLU*C+H*B+L*BCU<<8)&0xFFFF) add hl, hl diff --git a/src/crt/ishrs.src b/src/crt/ishrs.src index 5e4f13134..a7b000621 100644 --- a/src/crt/ishrs.src +++ b/src/crt/ishrs.src @@ -18,7 +18,7 @@ __ishru: xor a, a add hl, hl rla - db $DA ; push af \ add hl,hl \ sbc a,a -> jp c,* + db $DA ; push af \ add hl, hl \ sbc a, a -> jp c, * __ishrs: ; CC: if 0<=C<8: 35*r(PC)+9*r(SPL)+9*w(SPL)+4+(C&1==0)*(1*r(PC)-1)+(C&2==0)*(3*r(PC)-1)+(C&4==0)*(7*r(PC)-1) ; if 8<=C<16: 34*r(PC)+9*r(SPL)+6*w(SPL)+5+(C&1==0)*(1*r(PC)-1)+(C&2==0)*(3*r(PC)-1)+(C&4==0)*(7*r(PC)-1) diff --git a/src/crt/lcmps_fast.src b/src/crt/lcmps_fast.src index 624afbff9..3961d1cd7 100644 --- a/src/crt/lcmps_fast.src +++ b/src/crt/lcmps_fast.src @@ -7,7 +7,7 @@ __lcmps_fast: ld d, a ld a, e - sub a, d + sub a, d ret nz sbc hl, bc sbc a, a diff --git a/src/crt/llmulu.src b/src/crt/llmulu.src index be8b1d937..fc3550f6e 100644 --- a/src/crt/llmulu.src +++ b/src/crt/llmulu.src @@ -64,7 +64,7 @@ __llmulu: jr nz, .L.bit_loop pop af - jr nc, .L.byte_loop + jr nc, .L.byte_loop ld b, d ld c, e diff --git a/src/crt/llshrs_fast.src b/src/crt/llshrs_fast.src index 197b0d8c5..ea6c55d15 100644 --- a/src/crt/llshrs_fast.src +++ b/src/crt/llshrs_fast.src @@ -61,7 +61,7 @@ __llshrs_fast.hijack_llshru: and a, 00111000b ld (byteshift_smc) xor a, a - sub a, c + sub a, c jr $+1 .equ byteshift_smc, $-1 .L.shr1_8: diff --git a/src/crt/lltof.src b/src/crt/lltof.src index 37babdb7a..18dfd4e94 100644 --- a/src/crt/lltof.src +++ b/src/crt/lltof.src @@ -5,19 +5,19 @@ .type __lltof, @function __lltof: - push af - push iy - push bc - push de - push hl + push af + push iy + push bc + push de + push hl call __lltof_c pop af ld a, e pop de ld e, a - pop bc - pop iy - pop af + pop bc + pop iy + pop af ret .extern __lltof_c diff --git a/src/crt/lmulu.src b/src/crt/lmulu.src index b3de9a3b9..7e59ec56b 100644 --- a/src/crt/lmulu.src +++ b/src/crt/lmulu.src @@ -30,7 +30,7 @@ __lmulu: mlt de ; ude=E*C ld d, a ; d =A ld a, e ; a=E*C - ld e, l ; de=AL + ld e, l ; de=AL ld ixl, e ; ixl=L mlt de ; ude=L*A add a, e ; a=E*C+L*A diff --git a/src/crt/lmulu_fast.src b/src/crt/lmulu_fast.src index a67a4b7a7..508421cb8 100644 --- a/src/crt/lmulu_fast.src +++ b/src/crt/lmulu_fast.src @@ -21,7 +21,7 @@ __lmulu_fast: mlt de ; ude=E*C ld d, a ; d =A ld a, e ; a=E*C - ld e, l ; de=AL + ld e, l ; de=AL ld ixl, e ; ixl=L mlt de ; ude=L*A add a, e ; a=E*C+L*A @@ -79,7 +79,7 @@ __lmulu_fast: pop ix ; uix=UIX -- ld e, a ; e=H*C+L*B+(HLU*C+H*B+L*BCU<<8)+(E*C+HLU*B+H*BCU+L*A<<16)>>16 ret nc ; nc => e=L*C+(H*C+L*B<<8)+(HLU*C+H*B+L*BCU<<16)+(E*C+HLU*B+H*BCU+L*A<<24)>>24 - inc e ; e=L*C+(H*C+L*B<<8)+(HLU*C+H*B+L*BCU<<16)+(E*C+HLU*B+H*BCU+L*A<<24)>>24 + inc e ; e=L*C+(H*C+L*B<<8)+(HLU*C+H*B+L*BCU<<16)+(E*C+HLU*B+H*BCU+L*A<<24)>>24 ret ; (EUHL*AUBC)&0xFFFFFFFF=L*C+(H*C+L*B<<8)+(HLU*C+H*B+L*BCU<<16)+(E*C+HLU*B+H*BCU+L*A<<24)+(E*B+HLU*BCU+H*A<<32)+(E*BCU+HLU*A<<40)+(E*A<<48)&0xFFFFFFFF diff --git a/src/crt/smulu_fast.src b/src/crt/smulu_fast.src index 183035da2..d1635fc5b 100644 --- a/src/crt/smulu_fast.src +++ b/src/crt/smulu_fast.src @@ -17,10 +17,10 @@ __smulu_fast: ; a ubc ude uhl .L.Mul_HL_BC_HL_Fast: ;--------------+---------------+---------------+---------------- ld d, b - ld e, l ; de=BL + ld e, l ; de=BL ld b, h ; bc=HC - ld h, c ; hl=CL - mlt bc ; ubc=H*C + ld h, c ; hl=CL + mlt bc ; ubc=H*C mlt de ; ude=L*B mlt hl ; uhl=L*C ld a, h ; a=L*C>>8 diff --git a/src/crt/ulltof.src b/src/crt/ulltof.src index 344cd81d1..6ae1d6214 100644 --- a/src/crt/ulltof.src +++ b/src/crt/ulltof.src @@ -5,19 +5,19 @@ .type __ulltof, @function __ulltof: - push af - push iy - push bc - push de - push hl + push af + push iy + push bc + push de + push hl call __ulltof_c pop af ld a, e pop de ld e, a - pop bc - pop iy - pop af + pop bc + pop iy + pop af ret .extern __ulltof_c diff --git a/src/fileioc/fileioc.asm b/src/fileioc/fileioc.asm index c0aa7eb7b..138a2fb08 100644 --- a/src/fileioc/fileioc.asm +++ b/src/fileioc/fileioc.asm @@ -206,20 +206,20 @@ ti_Resize: pop hl jp c, util_ret_null ld de, TI_MAX_SIZE - or a,a - sbc hl,de - add hl,de + or a, a + sbc hl, de + add hl, de push af push hl call ti_Rewind.rewind ; rewind file offset pop hl pop af - jp nc,util_ret_null ; return if too big + jp nc, util_ret_null ; return if too big push hl call util_get_slot_size pop hl - or a,a - sbc hl,bc + or a, a + sbc hl, bc ld (resize_amount), hl jr z, .no_resize jr c, .decrease @@ -285,7 +285,7 @@ ti_OpenVar: add hl, sp ld a, (hl) ; (sp + 9) ; jr ti_Open.start ; emulated by dummifying next instruction - db $fe ; ld a,ti.AppVarObj -> cp a,$3e \ dec d + db $fe ; ld a, ti.AppVarObj -> cp a, $3e \ dec d assert ti.AppVarObj = $15 ;------------------------------------------------------------------------------- @@ -336,19 +336,19 @@ ti_Open: call nc, ti.DelVarArc call ti.PopOP1 .no_overwite: - ld hl,(ix + 9) - ld a,(hl) - cp a,'r' - jr z,.mode - cp a,'a' - jr z,.mode - cp a,'w' + ld hl, (ix + 9) + ld a, (hl) + cp a, 'r' + jr z, .mode + cp a, 'a' + jr z, .mode + cp a, 'w' jr nz, .ret_null_pop_ix .mode: inc hl - ld a,(hl) - cp a,'+' - jr nz,.no_append + ld a, (hl) + cp a, '+' + jr nz, .no_append .unarchive_var: call ti.ChkFindSym jr c, .not_found @@ -485,7 +485,7 @@ ti_Write: ; hl = number of chunks written if success ld iy, 0 add iy, sp - ld c,(iy + 12) + ld c, (iy + 12) call util_is_slot_open jr nz, .ret0 call util_is_in_ram @@ -524,8 +524,8 @@ ti_Write: ldir call util_get_offset pop hl - add hl,bc - ex de,hl + add hl, bc + ex de, hl call util_get_offset_ptr ld (hl), de ld hl, (iy + 9) @@ -791,7 +791,7 @@ ti_DeleteVar: push hl ld a, c ; jr ti_Delete.start ; emulated by dummifying next instruction: - db $fe ; ld a,ti.AppVarObj -> cp a,$3E \ dec d + db $fe ; ld a, ti.AppVarObj -> cp a, $3E \ dec d assert ti.AppVarObj = $15 ;------------------------------------------------------------------------------- @@ -801,7 +801,7 @@ ti_Delete: ; sp + 3 : pointer to appvar name ; return: ; hl = 0 if failure - ld a,ti.AppVarObj + ld a, ti.AppVarObj .start: pop de pop hl @@ -914,7 +914,7 @@ ti_DetectAny: ; sp + 9 : pointer storage of type of variable found ; return: ; hl -> name of variable - ld a,$ff + ld a, $ff jr ti_Detect.start_flag ;------------------------------------------------------------------------------- @@ -930,7 +930,7 @@ ti_DetectVar: add hl, sp ld a, (hl) ; (sp + 9) ; jr ti_Detect.start ; emulated by dummifying next instruction: - db $fe ; ld a,ti.AppVarObj -> cp a,$3E \ dec d + db $fe ; ld a, ti.AppVarObj -> cp a, $3E \ dec d assert ti.AppVarObj = $15 ;------------------------------------------------------------------------------- @@ -940,10 +940,10 @@ ti_Detect: ; sp + 6 : pointer to null terminated string of data to search for ; return: ; hl -> name of variable - ld a,ti.AppVarObj + ld a, ti.AppVarObj .start: ld (.smc_type), a - xor a,a + xor a, a .start_flag: ld (.smc_flag), a push ix @@ -1007,7 +1007,7 @@ ti_Detect: dec hl ld a, (hl) call ti.SetDEUToA - ex de,hl + ex de, hl cp a, $d0 jr nc, .finram ld de, 9 @@ -1109,7 +1109,7 @@ ti_GetTokenString: ld hl, (iy + 6) add hl, bc or a, a - sbc hl ,bc + sbc hl, bc jr z, .skipstore ld (hl), 1 .smc_length := $-1 @@ -1212,7 +1212,7 @@ ti_RenameVar: ld a, (hl) ; (sp + 9) ld iy, ti.flags ; probably not needed ; jr ti_Rename.start ; emulated by dummifying next instruction - db $fe ; ld a,appVarObj -> cp a,$3E \ dec d + db $fe ; ld a, appVarObj -> cp a, $3E \ dec d ;------------------------------------------------------------------------------- ti_Rename: @@ -1225,7 +1225,7 @@ ti_Rename: ; a = 1 if new file already exists ; a = 2 if old file does not exist ; a = 3 if other error - ld a,ti.AppVarObj ; file type + ld a, ti.AppVarObj ; file type .start: pop bc pop hl @@ -1395,7 +1395,7 @@ ti_RclVar: inc hl inc hl ld hl, (hl) ; (sp + 6) pointer to data - ld iy,ti.flags + ld iy, ti.flags call util_set_var_str call ti.FindSym jr c, .ret_neg_one @@ -1413,7 +1413,7 @@ ti_RclVar: ld (hl), de ret .ret_neg_one: - ld a,-1 + ld a, -1 ret ;------------------------------------------------------------------------------- @@ -1448,30 +1448,30 @@ ti_ArchiveHasRoomVar: push bc push de call util_is_slot_open - jr nz,.fail + jr nz, .fail call util_get_vat_ptr - ld hl,(hl) - ld bc,-6 - add hl,bc - ld c,(hl) ; get var name length + ld hl, (hl) + ld bc, -6 + add hl, bc + ld c, (hl) ; get var name length call util_get_data_ptr - ld de,(hl) + ld de, (hl) .entry_sym: - ld a,c - ex de,hl - ld hl,(hl) - ld bc,12 - add a,c - ld c,a - add.s hl,bc - jr c,.fail - ld c,l - ld b,h + ld a, c + ex de, hl + ld hl, (hl) + ld bc, 12 + add a, c + ld c, a + add.s hl, bc + jr c, .fail + ld c, l + ld b, h call ti.FindFreeArcSpot - ld a,1 + ld a, 1 ret nz .fail: - xor a,a + xor a, a ret ;------------------------------------------------------------------------------- @@ -1484,22 +1484,22 @@ ti_SetGCBehavior: ; None pop de pop bc - ex (sp),hl + ex (sp), hl push bc push de - add hl,de - or a,a - sbc hl,de - jr nz,.notdefault1 - ld hl,util_post_gc_default_handler + add hl, de + or a, a + sbc hl, de + jr nz, .notdefault1 + ld hl, util_post_gc_default_handler .notdefault1: - ld (util_post_gc_handler),hl - sbc hl,hl - adc hl,bc - jr nz,.notdefault2 - ld hl,util_pre_gc_default_handler + ld (util_post_gc_handler), hl + sbc hl, hl + adc hl, bc + jr nz, .notdefault2 + ld hl, util_pre_gc_default_handler .notdefault2: - ld (util_pre_gc_handler),hl + ld (util_pre_gc_handler), hl ret util_post_gc_default_handler := util_no_op util_pre_gc_default_handler := util_no_op @@ -1636,7 +1636,7 @@ util_get_vat_ptr: ; destroyed: ; A ld a, (curr_slot) - ld hl, vat_ptr0 ; vat_ptr0 = $d0244e + ld hl, vat_ptr0 ; vat_ptr0 = $d0244e dec a ret z inc h @@ -1715,7 +1715,7 @@ util_archive: ; properly handle garbage collects ret nz call ti.PushOP1 call ti_ArchiveHasRoomVar.entry_sym - jr z,.handle_gc + jr z, .handle_gc call ti.Arc_Unarc jp ti.PopOP1 .handle_gc: @@ -1735,7 +1735,7 @@ util_unarchive: call ti.PushOP1 call ti.ChkFindSym call ti.ChkInRam - call nz,ti.Arc_Unarc + call nz, ti.Arc_Unarc jp ti.PopOP1 ;------------------------------------------------------------------------------- diff --git a/src/graphx/graphx.asm b/src/graphx/graphx.asm index 224f1805f..3ab709a1b 100644 --- a/src/graphx/graphx.asm +++ b/src/graphx/graphx.asm @@ -5649,11 +5649,11 @@ calcSinCosSMC: _SineTable: ; sin(x) * 128 - ; 0| 1| 2| 3| 4| 5| 6| 7| 8| 9| A| B| C| D| E| F - db 0, 3, 6, 9, 13, 16, 19, 22, 25, 28, 31, 34, 37, 40, 43, 46 - db 49, 52, 55, 58, 60, 63, 66, 68, 71, 74, 76, 79, 81, 84, 86, 88 - db 91, 93, 95, 97, 99,101,103,105,106,108,110,111,113,114,116,117 - db 118,119,121,122,122,123,124,125,126,126,127,127,127,127,127,127,127 + ; 0| 1| 2| 3| 4| 5| 6| 7| 8| 9| A| B| C| D| E| F + db 0, 3, 6, 9, 13, 16, 19, 22, 25, 28, 31, 34, 37, 40, 43, 46 + db 49, 52, 55, 58, 60, 63, 66, 68, 71, 74, 76, 79, 81, 84, 86, 88 + db 91, 93, 95, 97, 99,101,103,105,106,108,110,111,113,114,116,117 + db 118,119,121,122,122,123,124,125,126,126,127,127,127,127,127,127,127 _CalcDXS: ex de, hl diff --git a/src/lcddrvce/lcddrvce.asm b/src/lcddrvce/lcddrvce.asm index 7542b7762..4601b7bbc 100644 --- a/src/lcddrvce/lcddrvce.asm +++ b/src/lcddrvce/lcddrvce.asm @@ -61,233 +61,233 @@ end macro lcd_Init: ; Increase the refcount scf - sbc hl,hl - ld de, 0 + sbc hl, hl + ld de, 0 .refcount := $-3 - add hl, de - ld (.refcount), hl - ret c + add hl, de + ld (.refcount), hl + ret c ; Initialize if the old refcount was 0 ; Always fully initialize on the first call per program invocation - ld hl, .fullinit - srl (hl) - jr c, .checkPython + ld hl, .fullinit + srl (hl) + jr c, .checkPython ; Additionally, fully initialize if an APD reset the SPI state to something other than LCD - ld a, (ti.mpSpiCtrl0) - cp a, ti.bmSpiMasterMono or ti.bmSpiClkPhase or ti.bmSpiClkPolarity - jr z, .fastinit + ld a, (ti.mpSpiCtrl0) + cp a, ti.bmSpiMasterMono or ti.bmSpiClkPhase or ti.bmSpiClkPolarity + jr z, .fastinit .checkPython: ; Check certificate for Python model - ld de, $0330 - call ti.FindFirstCertField - jr nz, .notPython - call ti.GetFieldSizeFromType - ld de, $0430 - call ti.FindField - jr nz, .notPython + ld de, $0330 + call ti.FindFirstCertField + jr nz, .notPython + call ti.GetFieldSizeFromType + ld de, $0430 + call ti.FindField + jr nz, .notPython ; Reinitializes Python hardware, probably (routine available on rev M+ boot code) ; Without this, LCD SPI transfers start failing a short time after init - call $000654 + call $000654 ; Magic SPI initialization sequence to work on Python models - ld de, ti.spiSpiFrFmt or ti.bmSpiFlash or ti.bmSpiFsPolarity or ti.bmSpiMasterMono + ld de, ti.spiSpiFrFmt or ti.bmSpiFlash or ti.bmSpiFsPolarity or ti.bmSpiMasterMono .loop: - ld (ti.mpSpiCtrl0), de - ld hl, ti.bmSpiTxClr or ti.bmSpiRxClr - ld (ti.mpSpiCtrl2), hl + ld (ti.mpSpiCtrl0), de + ld hl, ti.bmSpiTxClr or ti.bmSpiRxClr + ld (ti.mpSpiCtrl2), hl .fullinit: ; Becomes a nop after being shifted - db 1 - ld hl, ti.bmSpiChipReset - ld (ti.mpSpiCtrl2), hl - call ti.Delay10ms - bit ti.bSpiClkPolarity, e - ld e, ti.bmSpiFsPolarity or ti.bmSpiMasterMono or ti.bmSpiClkPhase or ti.bmSpiClkPolarity - jr z, .loop - ld hl, $21 - ld (ti.mpSpiIntCtrl), hl + db 1 + ld hl, ti.bmSpiChipReset + ld (ti.mpSpiCtrl2), hl + call ti.Delay10ms + bit ti.bSpiClkPolarity, e + ld e, ti.bmSpiFsPolarity or ti.bmSpiMasterMono or ti.bmSpiClkPhase or ti.bmSpiClkPolarity + jr z, .loop + ld hl, $21 + ld (ti.mpSpiIntCtrl), hl .notPython: - ld a, ti.bmSpiMasterMono or ti.bmSpiClkPhase or ti.bmSpiClkPolarity - ld (ti.mpSpiCtrl0), a + ld a, ti.bmSpiMasterMono or ti.bmSpiClkPhase or ti.bmSpiClkPolarity + ld (ti.mpSpiCtrl0), a .fastinit: - ld hl, ((9-1) shl 16) or (2-1) - ld (ti.mpSpiCtrl1), hl - ld hl, ti.bmSpiTxEn or ti.bmSpiTxClr or ti.bmSpiRxClr or ti.bmSpiChipEn - ld (ti.mpSpiCtrl2), hl + ld hl, ((9-1) shl 16) or (2-1) + ld (ti.mpSpiCtrl1), hl + ld hl, ti.bmSpiTxEn or ti.bmSpiTxClr or ti.bmSpiRxClr or ti.bmSpiChipEn + ld (ti.mpSpiCtrl2), hl ret lcd_Cleanup: ; Decrease the refcount - ld hl, (lcd_Init.refcount) - ld de, 1 - add hl, de - ld (lcd_Init.refcount), hl - ret nc + ld hl, (lcd_Init.refcount) + ld de, 1 + add hl, de + ld (lcd_Init.refcount), hl + ret nc ; Deinitialize if the new refcount is 0 - call lcd_Wait - ld hl, ((3-1) shl 16) or (12-1) - ld (ti.mpSpiCtrl1), hl - ld hl, ti.bmSpiTxEn or ti.bmSpiTxClr or ti.bmSpiRxClr - ld (ti.mpSpiCtrl2), hl + call lcd_Wait + ld hl, ((3-1) shl 16) or (12-1) + ld (ti.mpSpiCtrl1), hl + ld hl, ti.bmSpiTxEn or ti.bmSpiTxClr or ti.bmSpiRxClr + ld (ti.mpSpiCtrl2), hl ret lcd_Wait: - ld hl, ti.mpSpiStatus + 1 - ld a, (1 shl (ti.bSpiTxFifoBytes - 8)) - 1 + ld hl, ti.mpSpiStatus + 1 + ld a, (1 shl (ti.bSpiTxFifoBytes - 8)) - 1 .waitEmpty: - cp a, (hl) - jr c, .waitEmpty - dec hl + cp a, (hl) + jr c, .waitEmpty + dec hl .waitBusy: - bit ti.bSpiChipBusy, (hl) - jr nz, .waitBusy + bit ti.bSpiChipBusy, (hl) + jr nz, .waitBusy ret lcd_SetUniformGamma: - ld de, uniformGammaParams - jr _Gamma + ld de, uniformGammaParams + jr _Gamma lcd_SetDefaultGamma: - ld de, defaultGammaParams + ld de, defaultGammaParams _Gamma: ; Set positive gamma - ld bc, (14 shl 8) or $E0 - push bc - call lcd_SendSizedCommandRaw.entry + ld bc, (14 shl 8) or $E0 + push bc + call lcd_SendSizedCommandRaw.entry ; Set negative gamma - ex de, hl - pop bc - inc c - jr lcd_SendSizedCommandRaw.entry + ex de, hl + pop bc + inc c + jr lcd_SendSizedCommandRaw.entry lcd_SendSizedCommandRaw: - pop hl - pop bc - pop de - push de - push bc - push hl + pop hl + pop bc + pop de + push de + push bc + push hl .entry: - ld hl, ti.mpSpiStatus + 1 - ld a, ((ti.bmSpiTxFifoBytes shr 8) and $FF) - 1 + ld hl, ti.mpSpiStatus + 1 + ld a, ((ti.bmSpiTxFifoBytes shr 8) and $FF) - 1 .waitNotFull: - cp a, (hl) - jr c, .waitNotFull - ld l, ti.spiData + 1 - ld (hl), h - dec hl - ld (hl), c - ld c, 1 - mlt bc - ex de, hl - xor a, a - sub a, c - jr nz, lcd_SendParamsRaw.entry + cp a, (hl) + jr c, .waitNotFull + ld l, ti.spiData + 1 + ld (hl), h + dec hl + ld (hl), c + ld c, 1 + mlt bc + ex de, hl + xor a, a + sub a, c + jr nz, lcd_SendParamsRaw.entry ret lcd_SendParamsRaw: - pop hl - pop bc - pop de - push de - push bc - push hl + pop hl + pop bc + pop de + push de + push bc + push hl scf - sbc hl, hl - add hl, bc - ex de, hl - ret nc + sbc hl, hl + add hl, bc + ex de, hl + ret nc - ld de, ti.mpSpiRange - xor a, a - sub a, c + ld de, ti.mpSpiRange + xor a, a + sub a, c .entry: - and a, 7 - add a, a - add a, a - ld (.sendParamsOffsetSMC), a + and a, 7 + add a, a + add a, a + ld (.sendParamsOffsetSMC), a .sendParamsLoop: - ld e, ti.spiStatus + 1 + ld e, ti.spiStatus + 1 scf .waitForEight: - ld a, (de) + ld a, (de) rla - jr c, .waitForEight - ld e, ti.spiData + 1 - jr nz, $ + jr c, .waitForEight + ld e, ti.spiData + 1 + jr nz, $ .sendParamsOffsetSMC = $-1 repeat 8 - ld (de), a - dec de + ld (de), a + dec de ldi end repeat - ret po - cp a, a - jr .sendParamsLoop + ret po + cp a, a + jr .sendParamsLoop _sendSingleByte: - ld l, ti.spiStatus + 1 - ld a, ((ti.bmSpiTxFifoBytes shr 8) and $FF) - 1 + ld l, ti.spiStatus + 1 + ld a, ((ti.bmSpiTxFifoBytes shr 8) and $FF) - 1 .waitNotFull: - cp a, (hl) - jr c, .waitNotFull - ld l, ti.spiData - ld a, (de) - ld (hl), a - inc hl - ld (hl), l + cp a, (hl) + jr c, .waitNotFull + ld l, ti.spiData + ld a, (de) + ld (hl), a + inc hl + ld (hl), l ret lcd_SendCommand: - ld b, 0+1 - jr lcd_SendSizedCommandBytes.entry + ld b, 0+1 + jr lcd_SendSizedCommandBytes.entry lcd_SendCommand1: - ld b, 1+1 - jr lcd_SendSizedCommandBytes.entry + ld b, 1+1 + jr lcd_SendSizedCommandBytes.entry lcd_SendCommand2: - ld b, 2+1 - jr lcd_SendSizedCommandBytes.entry + ld b, 2+1 + jr lcd_SendSizedCommandBytes.entry lcd_SendSizedCommandBytes: - pop hl - pop bc - push bc - push hl - inc b + pop hl + pop bc + push bc + push hl + inc b .entry: - ld hl, 3 - add hl, sp - ex de, hl - ld hl, ti.mpSpiData + 1 - ld (hl), h + ld hl, 3 + add hl, sp + ex de, hl + ld hl, ti.mpSpiData + 1 + ld (hl), h .loop: - call _sendSingleByte - inc de - inc de - inc de - djnz .loop + call _sendSingleByte + inc de + inc de + inc de + djnz .loop ret lcd_SendSizedCommandWords: - ld hl, 4 - add hl, sp - ld b, (hl) - inc b - ex de, hl - ld hl, ti.mpSpiData + 1 - ld (hl), h + ld hl, 4 + add hl, sp + ld b, (hl) + inc b + ex de, hl + ld hl, ti.mpSpiData + 1 + ld (hl), h .loop: - dec de - call _sendSingleByte - dec b - ret z - inc de - inc de - inc de - inc de - call _sendSingleByte - jr .loop + dec de + call _sendSingleByte + dec b + ret z + inc de + inc de + inc de + inc de + call _sendSingleByte + jr .loop defaultGammaParams: ; Positive gamma diff --git a/src/libc/acosf.src b/src/libc/acosf.src index ab91813cc..f7da9b6a9 100644 --- a/src/libc/acosf.src +++ b/src/libc/acosf.src @@ -1,15 +1,15 @@ - .assume adl=1 + .assume adl=1 - .section .text - .global _acos + .section .text + .global _acos .type _acos, @function .global _acosf .type _acosf, @function .ifdef PREFER_OS_LIBC - .set _acosf, 0x022100 - .set _acos, _acosf + .set _acosf, 0x022100 + .set _acos, _acosf .else diff --git a/src/libc/allocator/allocator_simple.src b/src/libc/allocator/allocator_simple.src index 7ceb3cedf..dfe04d560 100644 --- a/src/libc/allocator/allocator_simple.src +++ b/src/libc/allocator/allocator_simple.src @@ -34,8 +34,8 @@ _realloc: _free: ret - .section .data._heap_ptr - .local _heap_ptr + .section .data._heap_ptr + .local _heap_ptr _heap_ptr: .d24 ___heap_low diff --git a/src/libc/atexit.src b/src/libc/atexit.src index bd4cda812..99be5f152 100644 --- a/src/libc/atexit.src +++ b/src/libc/atexit.src @@ -1,5 +1,5 @@ - .assume adl=1 + .assume adl=1 .section .text .global _atexit @@ -37,6 +37,6 @@ _on_exit: .section .bss .global __atexit_functions __atexit_functions: - .ds 3 + .ds 3 - .extern _malloc + .extern _malloc diff --git a/src/libc/calloc.src b/src/libc/calloc.src index 0e1ff6bf7..ca325138d 100644 --- a/src/libc/calloc.src +++ b/src/libc/calloc.src @@ -71,6 +71,6 @@ _calloc: .endif - .extern _malloc + .extern _malloc .extern __imulu .extern _memset diff --git a/src/libc/inchar.src b/src/libc/inchar.src index e19c2f27a..cc79c49bd 100644 --- a/src/libc/inchar.src +++ b/src/libc/inchar.src @@ -28,9 +28,9 @@ _inchar: .L.lut: db 0,0,0,0,0,0,0,0,0,10 ; - db 0,'WRMH',0,0 ; + - × ÷ ^ undef - db 0,'Z'+ 1,'VQLG',0,0 ; (-) 3 6 9 ) TAN VARS undef - db 0,'ZUPKFC',0 ; . 2 5 8 ( COS PRGM STAT + db 0,'WRMH',0,0 ; + - × ÷ ^ undef + db 0,'Z'+ 1,'VQLG',0,0 ; (-) 3 6 9 ) TAN VARS undef + db 0,'ZUPKFC',0 ; . 2 5 8 ( COS PRGM STAT db ' YTOJEBX',0 ; 0 1 4 7 , SIN APPS XT?n undef db 'XSNIDA' ; STO LN LOG x2 x-1 MATH db 0,0,0,0,0,0,0,0,0,0 ; diff --git a/src/libc/iszerof.src b/src/libc/iszerof.src index 0d8228ca1..3dfcd6074 100644 --- a/src/libc/iszerof.src +++ b/src/libc/iszerof.src @@ -17,6 +17,6 @@ __iszerof: ret nz ; non-zero mantissa ld a, l adc a, a - sub a, 1 + sub a, 1 sbc a, a ret diff --git a/src/libc/memmem.src b/src/libc/memmem.src index cb680fb6b..87c03692f 100644 --- a/src/libc/memmem.src +++ b/src/libc/memmem.src @@ -8,10 +8,10 @@ .type _memcmp_fast, @function ; void *memmem(const void *haystack, size_t haystack_len, const void *needle, size_t needle_len) - .equ haystack, 3 - .equ haystack_len, 6 - .equ needle, 9 - .equ needle_len, 12 + .equ haystack, 3 + .equ haystack_len, 6 + .equ needle, 9 + .equ needle_len, 12 _memmem: ld iy, 0 add iy, sp diff --git a/src/libc/strlcpy.src b/src/libc/strlcpy.src index 37e36203f..c55b56c9e 100644 --- a/src/libc/strlcpy.src +++ b/src/libc/strlcpy.src @@ -9,51 +9,51 @@ _strlcpy: - ld iy, 0 - lea bc, iy + 0 ; set bc to 0 - add iy, sp + ld iy, 0 + lea bc, iy + 0 ; set bc to 0 + add iy, sp ; do min(strlen(src), dsize-1) ; strlen(src) - ld hl, (iy + 6) ; hl = pointer to src - xor a, a ; clear carry and set a to 0 - cpir ; dec bc until byte at (hl) matches a (= NUL) + ld hl, (iy + 6) ; hl = pointer to src + xor a, a ; clear carry and set a to 0 + cpir ; dec bc until byte at (hl) matches a (= NUL) ; calculate HL=-BC-1 - sbc hl, hl + sbc hl, hl scf - sbc hl, bc ; always sets carry flag + sbc hl, bc ; always sets carry flag ; now hl = strlen(src) - ld bc, (iy + 9) ; bc = dsize - ex de, hl ; de = strlen(src) + ld bc, (iy + 9) ; bc = dsize + ex de, hl ; de = strlen(src) ; check if dsize is zero - sbc hl, hl ; set hl to -1, carry was already set - add hl, bc ; hl = -1 + dsize - ex de, hl ; hl = strlen(src), de = dsize - 1 - ret nc ; do nothing and return strlen(src) if dsize is zero + sbc hl, hl ; set hl to -1, carry was already set + add hl, bc ; hl = -1 + dsize + ex de, hl ; hl = strlen(src), de = dsize - 1 + ret nc ; do nothing and return strlen(src) if dsize is zero - push hl ; save strlen(src) for after copy + push hl ; save strlen(src) for after copy ; dsize is not zero, compare them ; hl = strlen(src) ; de = dsize - 1 ; carry flag is set, so calculate hl - (de + 1) - sbc hl, de + sbc hl, de ; if hl > de, strlen(src) > (dsize - 1); string is truncated, keep bc as dsize - jr nc, _strlcpy.ready_for_ldir + jr nc, _strlcpy.ready_for_ldir ; hl <= de, so strlen(src) <= (dsize - 1); string is not truncated, set bc to strlen(src) + 1 - pop bc - push bc - inc bc + pop bc + push bc + inc bc _strlcpy.ready_for_ldir: - ld de, (iy + 3) ; put dst in de - ld hl, (iy + 6) ; put src in hl + ld de, (iy + 3) ; put dst in de + ld hl, (iy + 6) ; put src in hl ; bc is filled already and greater than 0 ; at this point we are set up for an ldir: @@ -62,13 +62,13 @@ _strlcpy.ready_for_ldir: ; bc has the length (including space for null terminator) ldir - pop hl ; get the result of strlen(src) from earlier and put into hl + pop hl ; get the result of strlen(src) from earlier and put into hl - ret c ; return strlen(src) if string was not truncated + ret c ; return strlen(src) if string was not truncated ; string was truncated, so replace final byte with NUL - dec de + dec de ; a is already 0 - ld (de), a ; store null terminator at the address pointed to by de + ld (de), a ; store null terminator at the address pointed to by de - ret ; return strlen(src) + ret ; return strlen(src) diff --git a/src/libc/strndup.src b/src/libc/strndup.src index b46ad44eb..014f70be6 100644 --- a/src/libc/strndup.src +++ b/src/libc/strndup.src @@ -7,7 +7,7 @@ _strndup: pop bc pop de - ex (sp),hl + ex (sp), hl push de push bc diff --git a/src/libc/strtoll.src b/src/libc/strtoll.src index 6628062a2..28ec2e970 100644 --- a/src/libc/strtoll.src +++ b/src/libc/strtoll.src @@ -264,7 +264,7 @@ __strtoll_common.__llmul_add_b_overflow: add hl, de ld (ix - 4), l ; UHL ld d, c - ld e, (ix - 9) ; E + ld e, (ix - 9) ; E mlt de ld l, h ld h, a diff --git a/src/libload/libload.asm b/src/libload/libload.asm index 9fd4f69dc..72fee31b2 100644 --- a/src/libload/libload.asm +++ b/src/libload/libload.asm @@ -104,10 +104,10 @@ disable_relocations ld (show_msgs), a ; disable or enable error printing pop hl - ld de,helpers.source - add hl,de - ld de,helpers.destination - ld bc,helpers.length + ld de, helpers.source + add hl, de + ld de, helpers.destination + ld bc, helpers.length ldir ld hl, arc_lib_locs ld (end_arc_lib_locs), hl @@ -291,7 +291,7 @@ assert LIB_MAGIC_1 = LIB_MAGIC_1_ALT+1 cp a, LIB_MAGIC_2_ALT .magic_error: jr z, lib_exists - bit optional,(iy + LIB_FLAGS) + bit optional, (iy + LIB_FLAGS) jr z, invalid_error optional_lib_clear_pop_hl: pop hl ; get version byte pointer @@ -407,7 +407,7 @@ need_to_load_lib: pop bc pop de pop hl - jr nc,.enough_mem + jr nc, .enough_mem call ti.PopOP1 ; pop program name jp ti.ErrMemory ; throw a memory error -- need more ram! diff --git a/src/msddrvce/msddrvce.asm b/src/msddrvce/msddrvce.asm index c5bd2f066..6126942bf 100644 --- a/src/msddrvce/msddrvce.asm +++ b/src/msddrvce/msddrvce.asm @@ -1123,7 +1123,7 @@ scsi_async_data: compare_hl_zero ld iy,(iy + 12) ; xfer struct jq nz,scsi_async_issue_callback_fail - bit 7,(ymsdXfer.cbw + packetCBW.dir) + bit 7,(ymsdXfer.cbw + packetCBW.dir) push iy ld iy,(ymsdXfer.msd) ; get msd struct ld a,(ymsd.bulkin) diff --git a/src/srldrvce/srldrvce.asm b/src/srldrvce/srldrvce.asm index e91beb930..8fefd5392 100644 --- a/src/srldrvce/srldrvce.asm +++ b/src/srldrvce/srldrvce.asm @@ -558,9 +558,9 @@ srl_GetCDCStandardDescriptors: ret .descriptors: - dl .device, .configurations, .langids - db 3 - dl .strings + dl .device, .configurations, .langids + db 3 + dl .strings .device emit $12: $1201000202000040C016E105200201020001 bswap $12 .configurations dl .configuration1 .configuration1 emit $3e: $09023e00020100c0320904000001020200000524000110042402000524060001070582030800ff09040100020a0200000705040240000107058302400001 bswap $3e diff --git a/src/usbdrvce/usbdrvce.asm b/src/usbdrvce/usbdrvce.asm index 5353eb43b..3c25a22f5 100644 --- a/src/usbdrvce/usbdrvce.asm +++ b/src/usbdrvce/usbdrvce.asm @@ -5213,13 +5213,13 @@ usb_RepeatTimerCycles: ;------------------------------------------------------------------------------- _DefaultControlEndpointDescriptor: - db 7, ENDPOINT_DESCRIPTOR, 0, 0 - dw 8 - db 0 + db 7, ENDPOINT_DESCRIPTOR, 0, 0 + dw 8 + db 0 _DefaultStandardDescriptors: - dl .device, .configurations, .langids - db 2 - dl .strings + dl .device, .configurations, .langids + db 2 + dl .strings .device emit $12: $1201000200000040510408E0200201020003 bswap $12 .configurations dl .configuration1, .configuration2, .configuration3 .configuration1 emit $23: $0902230001010080FA0904000002FF0100000705810240000007050202400000030903 bswap $23 diff --git a/test/floating_point/float64_arithmetic/src/data.S b/test/floating_point/float64_arithmetic/src/data.S index 546632f07..8f1d7c2b4 100644 --- a/test/floating_point/float64_arithmetic/src/data.S +++ b/test/floating_point/float64_arithmetic/src/data.S @@ -4,27 +4,27 @@ .global _f64_pos_zero _f64_pos_zero: - db $00, $00, $00, $00, $00, $00, $00, $00 + db $00, $00, $00, $00, $00, $00, $00, $00 .global _f64_neg_zero _f64_neg_zero: - db $00, $00, $00, $00, $00, $00, $00, $80 + db $00, $00, $00, $00, $00, $00, $00, $80 .global _f64_pos_one _f64_pos_one: - db $00, $00, $00, $00, $00, $00, $F0, $3F + db $00, $00, $00, $00, $00, $00, $F0, $3F .global _f64_neg_one _f64_neg_one: - db $00, $00, $00, $00, $00, $00, $F0, $BF + db $00, $00, $00, $00, $00, $00, $F0, $BF .global _f64_pos_pi _f64_pos_pi: - db $18, $2D, $44, $54, $FB, $21, $09, $40 + db $18, $2D, $44, $54, $FB, $21, $09, $40 .global _f64_neg_pi _f64_neg_pi: - db $18, $2D, $44, $54, $FB, $21, $09, $C0 + db $18, $2D, $44, $54, $FB, $21, $09, $C0 .global _drem_libcall _drem_libcall: diff --git a/test/standalone/stdbit/src/data.S b/test/standalone/stdbit/src/data.S index 9337dbd21..be926de8f 100644 --- a/test/standalone/stdbit/src/data.S +++ b/test/standalone/stdbit/src/data.S @@ -14,7 +14,7 @@ _zero_u24: _zero_u32: _zero_u48: _zero_u64: - .db $00, $00, $00, $00, $00, $00, $00, $00 + .db $00, $00, $00, $00, $00, $00, $00, $00 .global _one_u8 .global _one_u16 @@ -28,7 +28,7 @@ _one_u24: _one_u32: _one_u48: _one_u64: - .db $01, $00, $00, $00, $00, $00, $00, $00 + .db $01, $00, $00, $00, $00, $00, $00, $00 .global _umax_u8 .global _umax_u16 @@ -42,7 +42,7 @@ _umax_u24: _umax_u32: _umax_u48: _umax_u64: - .db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF + .db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF .global _smin_u8 .global _smin_u16 @@ -51,19 +51,19 @@ _umax_u64: .global _smin_u48 .global _smin_u64 _smin_u64: - .db $00 - .db $00 + .db $00 + .db $00 _smin_u48: - .db $00 - .db $00 + .db $00 + .db $00 _smin_u32: - .db $00 + .db $00 _smin_u24: - .db $00 + .db $00 _smin_u16: - .db $00 + .db $00 _smin_u8: - .db $80 + .db $80 .global _smax_u8 .global _smax_u16 @@ -72,66 +72,66 @@ _smin_u8: .global _smax_u48 .global _smax_u64 _smax_u64: - .db $FF - .db $FF + .db $FF + .db $FF _smax_u48: - .db $FF - .db $FF + .db $FF + .db $FF _smax_u32: - .db $FF + .db $FF _smax_u24: - .db $FF + .db $FF _smax_u16: - .db $FF + .db $FF _smax_u8: - .db $7F + .db $7F .global _val_0 _val_0: - .db 0 + .db 0 .global _val_1 _val_1: - .db 1 + .db 1 .global _val_2 _val_2: - .db 2 + .db 2 .global _val_7 _val_7: - .db 7 + .db 7 .global _val_8 _val_8: - .db 8 + .db 8 .global _val_15 _val_15: - .db 15 + .db 15 .global _val_16 _val_16: - .db 16 + .db 16 .global _val_23 _val_23: - .db 23 + .db 23 .global _val_24 _val_24: - .db 24 + .db 24 .global _val_31 _val_31: - .db 31 + .db 31 .global _val_32 _val_32: - .db 32 + .db 32 .global _val_47 _val_47: - .db 47 + .db 47 .global _val_48 _val_48: - .db 48 + .db 48 .global _val_63 _val_63: - .db 63 + .db 63 .global _val_64 _val_64: - .db 64 + .db 64 ; uint8_t byteswap_u8[4] = { ; 0x00, diff --git a/test/standalone/wide_char/src/rename.s b/test/standalone/wide_char/src/rename.s index 872d672bc..5ccc94b53 100644 --- a/test/standalone/wide_char/src/rename.s +++ b/test/standalone/wide_char/src/rename.s @@ -19,19 +19,19 @@ _PTR_FFFFFF: .global _T_wcsnlen _T_wmemset: - jp _wmemset + jp _wmemset _T_wmemcpy: - jp _wmemcpy + jp _wmemcpy _T_wmemmove: - jp _wmemmove + jp _wmemmove _T_wmemcmp: - jp _wmemcmp + jp _wmemcmp _T_wmemchr: - jp _wmemchr + jp _wmemchr _T_wcslen: - jp _wcslen + jp _wcslen _T_wcsnlen: - jp _wcsnlen + jp _wcsnlen .extern _wmemset .extern _wmemcpy