notaz.gp2x.de
/
picodrive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
error checking for png
[picodrive.git]
/
Pico
/
cd
/
Pico.s
diff --git
a/Pico/cd/Pico.s
b/Pico/cd/Pico.s
index
b1f554c
..
6cd140a
100644
(file)
--- a/
Pico/cd/Pico.s
+++ b/
Pico/cd/Pico.s
@@
-1,6
+1,6
@@
@ vim:filetype=armasm
@ vim:filetype=armasm
-@ SekRunPS runs PicoCpu
and PicoCpu
S68k interleaved in steps of PS_STEP_M68K
+@ SekRunPS runs PicoCpu
CM68k and PicoCpuC
S68k interleaved in steps of PS_STEP_M68K
@ cycles. This is done without calling CycloneRun and jumping directly to
@ Cyclone code to avoid pushing/popping all the registers every time.
@ cycles. This is done without calling CycloneRun and jumping directly to
@ Cyclone code to avoid pushing/popping all the registers every time.
@@
-13,8
+13,8
@@
@ .extern is ignored by gas, we add these here just to see what we depend on.
.extern CycloneJumpTab
.extern CycloneDoInterrupt
@ .extern is ignored by gas, we add these here just to see what we depend on.
.extern CycloneJumpTab
.extern CycloneDoInterrupt
-.extern PicoCpu
-.extern PicoCpuS68k
+.extern PicoCpu
CM68k
+.extern PicoCpu
C
S68k
.extern SekCycleAim
.extern SekCycleCnt
.extern SekCycleAimS68k
.extern SekCycleAim
.extern SekCycleCnt
.extern SekCycleAimS68k
@@
-28,12
+28,12
@@
.global SekRunPS @ cyc_m68k, cyc_s68k
SekRunPS:
.global SekRunPS @ cyc_m68k, cyc_s68k
SekRunPS:
- stmfd sp!, {r4-r11,lr}
+ stmfd sp!, {r4-r
8,r10,r
11,lr}
sub sp, sp, #2*4 @ sp[0] = main_cycle_cnt, sp[4] = run_cycle_cnt
@ override CycloneEnd for both contexts
sub sp, sp, #2*4 @ sp[0] = main_cycle_cnt, sp[4] = run_cycle_cnt
@ override CycloneEnd for both contexts
- ldr r7, =PicoCpu
- ldr lr, =PicoCpuS68k
+ ldr r7, =PicoCpu
CM68k
+ ldr lr, =PicoCpu
C
S68k
ldr r2, =CycloneEnd_M68k
ldr r3, =CycloneEnd_S68k
str r2, [r7,#0x98]
ldr r2, =CycloneEnd_M68k
ldr r3, =CycloneEnd_S68k
str r2, [r7,#0x98]
@@
-41,13
+41,13
@@
SekRunPS:
@ update aims
ldr r8, =SekCycleAim
@ update aims
ldr r8, =SekCycleAim
- ldr r
9,
=SekCycleAimS68k
+ ldr r
10,
=SekCycleAimS68k
ldr r2, [r8]
ldr r2, [r8]
- ldr r3, [r
9
]
+ ldr r3, [r
10
]
add r2, r2, r0
add r3, r3, r1
str r2, [r8]
add r2, r2, r0
add r3, r3, r1
str r2, [r8]
- str r3, [r
9
]
+ str r3, [r
10
]
ldr r1, =SekCycleCnt
ldr r0, =((488<<16)-PS_STEP_M68K)
ldr r1, =SekCycleCnt
ldr r0, =((488<<16)-PS_STEP_M68K)
@@
-70,19
+70,19
@@
CycloneEnd_M68k:
ldr r0, [sp,#4] @ run_cycle_cnt
ldr r1, [r3]
str r4, [r7,#0x40] ;@ Save Current PC + Memory Base
ldr r0, [sp,#4] @ run_cycle_cnt
ldr r1, [r3]
str r4, [r7,#0x40] ;@ Save Current PC + Memory Base
- strb r
9,
[r7,#0x46] ;@ Save Flags (NZCV)
+ strb r
10,
[r7,#0x46] ;@ Save Flags (NZCV)
sub r0, r0, r5 @ subtract leftover cycles (which should be negative)
add r0, r0, r1
str r0, [r3]
schedule_s68k:
ldr r8, =SekCycleCntS68k
sub r0, r0, r5 @ subtract leftover cycles (which should be negative)
add r0, r0, r1
str r0, [r3]
schedule_s68k:
ldr r8, =SekCycleCntS68k
- ldr r
9,
=SekCycleAimS68k
+ ldr r
10,
=SekCycleAimS68k
ldr r3, [sp]
ldr r8, [r8]
ldr r3, [sp]
ldr r8, [r8]
- ldr r
9, [r9
]
+ ldr r
10,[r10
]
- sub r0, r
9
, r8
+ sub r0, r
10
, r8
mov r2, r3
add r3, r3, r2, asr #1
add r3, r3, r2, asr #3 @ cycn_s68k = (cycn + cycn/2 + cycn/8)
mov r2, r3
add r3, r3, r2, asr #1
add r3, r3, r2, asr #3 @ cycn_s68k = (cycn + cycn/2 + cycn/8)
@@
-90,7
+90,7
@@
schedule_s68k:
subs r5, r0, r3, asr #16
ble schedule_m68k @ s68k has not enough cycles
subs r5, r0, r3, asr #16
ble schedule_m68k @ s68k has not enough cycles
- ldr r7, =PicoCpuS68k
+ ldr r7, =PicoCpu
C
S68k
str r5, [sp,#4] @ run_cycle_cnt
b CycloneRunLocal
str r5, [sp,#4] @ run_cycle_cnt
b CycloneRunLocal
@@
-101,7
+101,7
@@
CycloneEnd_S68k:
ldr r0, [sp,#4] @ run_cycle_cnt
ldr r1, [r3]
str r4, [r7,#0x40] ;@ Save Current PC + Memory Base
ldr r0, [sp,#4] @ run_cycle_cnt
ldr r1, [r3]
str r4, [r7,#0x40] ;@ Save Current PC + Memory Base
- strb r
9,
[r7,#0x46] ;@ Save Flags (NZCV)
+ strb r
10,
[r7,#0x46] ;@ Save Flags (NZCV)
sub r0, r0, r5 @ subtract leftover cycles (should be negative)
add r0, r0, r1
str r0, [r3]
sub r0, r0, r5 @ subtract leftover cycles (should be negative)
add r0, r0, r1
str r0, [r3]
@@
-110,33
+110,33
@@
schedule_m68k:
ldr r1, =PS_STEP_M68K
ldr r3, [sp] @ main_cycle_cnt
ldr r8, =SekCycleCnt
ldr r1, =PS_STEP_M68K
ldr r3, [sp] @ main_cycle_cnt
ldr r8, =SekCycleCnt
- ldr r
9,
=SekCycleAim
+ ldr r
10,
=SekCycleAim
subs r3, r3, r1
bmi SekRunPS_end
ldr r8, [r8]
subs r3, r3, r1
bmi SekRunPS_end
ldr r8, [r8]
- ldr r
9, [r9
]
+ ldr r
10,[r10
]
str r3, [sp] @ update main_cycle_cnt
str r3, [sp] @ update main_cycle_cnt
- sub r0, r
9
, r8
+ sub r0, r
10
, r8
subs r5, r0, r3, asr #16
ble schedule_s68k @ m68k has not enough cycles
subs r5, r0, r3, asr #16
ble schedule_s68k @ m68k has not enough cycles
- ldr r7, =PicoCpu
+ ldr r7, =PicoCpu
CM68k
str r5, [sp,#4] @ run_cycle_cnt
b CycloneRunLocal
SekRunPS_end:
str r5, [sp,#4] @ run_cycle_cnt
b CycloneRunLocal
SekRunPS_end:
- ldr r7, =PicoCpu
- ldr lr, =PicoCpuS68k
+ ldr r7, =PicoCpu
CM68k
+ ldr lr, =PicoCpu
C
S68k
mov r0, #0
str r0, [r7,#0x98] @ remove CycloneEnd handler
str r0, [lr,#0x98]
@ return
add sp, sp, #2*4
mov r0, #0
str r0, [r7,#0x98] @ remove CycloneEnd handler
str r0, [lr,#0x98]
@ return
add sp, sp, #2*4
- ldmfd sp!, {r4-r11,pc}
+ ldmfd sp!, {r4-r
8,r10,r
11,pc}
@@
-147,10
+147,9
@@
CycloneRunLocal:
;@ r6 = Opcode Jump table
;@ r7 = Pointer to Cpu Context
;@ r8 = Current Opcode
;@ r6 = Opcode Jump table
;@ r7 = Pointer to Cpu Context
;@ r8 = Current Opcode
- ldrb r
9,[r7,#0x46] ;@ r9
= Flags (NZCV)
+ ldrb r
10,[r7,#0x46];@ r10
= Flags (NZCV)
ldr r1,[r7,#0x44] ;@ get SR high and IRQ level
ldr r1,[r7,#0x44] ;@ get SR high and IRQ level
- orr r9,r9,r9,lsl #28 ;@ r9 = Flags 0xf0000000, cpsr format
- ;@ r10 = Source value / Memory Base
+ orr r10,r10,r10,lsl #28 ;@ r10 = Flags 0xf0000000, cpsr format
;@ CheckInterrupt:
movs r0,r1,lsr #24 ;@ Get IRQ level
;@ CheckInterrupt:
movs r0,r1,lsr #24 ;@ Get IRQ level
@@
-166,7
+165,7
@@
NoIntsLocal:
ldr r0,[r7,#0x58] ;@ state_flags
ldrh r8,[r4],#2 ;@ Fetch first opcode
tst r0,#0x03 ;@ special state?
ldr r0,[r7,#0x58] ;@ state_flags
ldrh r8,[r4],#2 ;@ Fetch first opcode
tst r0,#0x03 ;@ special state?
- andeq r
9,r9
,#0xf0000000
+ andeq r
10,r10
,#0xf0000000
ldreq pc,[r6,r8,asl #2] ;@ Jump to opcode handler
CycloneSpecial2:
ldreq pc,[r6,r8,asl #2] ;@ Jump to opcode handler
CycloneSpecial2: