From ce5d473755bb51b5ed231a6687ecf89b912f9b77 Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Sat, 20 May 2017 19:14:29 +0100 Subject: [PATCH] v68: don't rewrite reset vectors or scribble off end --- Kernel/platform-v68-softmmu/p68000.S | 7 ++----- Kernel/platform-v68/p68000.S | 8 ++++---- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/Kernel/platform-v68-softmmu/p68000.S b/Kernel/platform-v68-softmmu/p68000.S index 9a8d6fd5..5e80a8d1 100644 --- a/Kernel/platform-v68-softmmu/p68000.S +++ b/Kernel/platform-v68-softmmu/p68000.S @@ -35,8 +35,8 @@ init_hardware: sub.w #64,d0 ; Guess for kernel move.w d0,procmem ; guesses for now - move.l #0,a0 - move.w #256,d0 + move.l #8,a0 + move.w #253,d0 move.l #unexpected,d1 init_trap_loop: move.l d1,(a0)+ @@ -81,9 +81,6 @@ timer_irq: clr.b U_DATA__U_ININTERRUPT(a5) move.b $00F04000,d0 ; Re-enable - ; DEBUG FIXME - bra no_signal - tst.b U_DATA__U_INSYS(a5) bne no_preempt tst.b need_resched diff --git a/Kernel/platform-v68/p68000.S b/Kernel/platform-v68/p68000.S index 67a8ef02..de691f90 100644 --- a/Kernel/platform-v68/p68000.S +++ b/Kernel/platform-v68/p68000.S @@ -29,14 +29,14 @@ init_early: ; FIXME: could be in discard if we wanted ; init_hardware: - ; set system RAM size(hadcode hacks for now) + ; set system RAM size(hardcode hacks for now) move.w #512,d0 move.w d0,ramsize sub.w #64,d0 ; Guess for kernel move.w d0,procmem ; guesses for now - move.l #0,a0 - move.w #256,d0 + move.l #8,a0 + move.w #253,d0 move.l #unexpected,d1 init_trap_loop: move.l d1,(a0)+ @@ -118,7 +118,7 @@ program_vectors: rts ; -; TODO +; We do no banking so we need to do nothing here. ; map_process_always: map_process: -- 2.34.1