notaz.gp2x.de
/
picodrive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
FAME integration finished, some adjustments of CPU core stuff
[picodrive.git]
/
Pico
/
cd
/
Pico.s
diff --git
a/Pico/cd/Pico.s
b/Pico/cd/Pico.s
index
b1f554c
..
87e8554
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
@@
-32,8
+32,8
@@
SekRunPS:
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]
@@
-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
@@
-122,15
+122,15
@@
schedule_m68k:
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]
mov r0, #0
str r0, [r7,#0x98] @ remove CycloneEnd handler
str r0, [lr,#0x98]