Mercurial > hg > Members > kono > nitros9-code

changeset 2630:e310e8613606

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed earlier change from yesterday due to misunderstanding of ordering of 6809 vectors on CoCo 1/2...
author Boisy Pitre <boisy.pitre@nuance.com>
date Sun, 26 Feb 2012 16:22:27 -0600
parents 65b1b5c80fec
children 442795681807
files defs/os9.d level1/modules/kernel/krn.asm
diffstat 2 files changed, 41 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/defs/os9.d	Sun Feb 26 07:35:52 2012 -0600
+++ b/defs/os9.d	Sun Feb 26 16:22:27 2012 -0600
@@ -482,12 +482,19 @@
 D.Clock2       RMB       2                   CC Clock2 entry address
 
                ORG       $100
+*D.XSWI3        RMB       3
+*D.XSWI2        RMB       3
+*D.XFIRQ        RMB       3
+*D.XIRQ         RMB       3
+*D.XSWI         RMB       3
+*D.XNMI         RMB       3
+
 D.XSWI3        RMB       3
 D.XSWI2        RMB       3
-D.XFIRQ        RMB       3
-D.XIRQ         RMB       3
 D.XSWI         RMB       3
 D.XNMI         RMB       3
+D.XIRQ         RMB       3
+D.XFIRQ        RMB       3
 
 * Table Sizes
 BMAPSZ         EQU       32                  Bitmap table size
--- a/level1/modules/kernel/krn.asm	Sun Feb 26 07:35:52 2012 -0600
+++ b/level1/modules/kernel/krn.asm	Sun Feb 26 16:22:27 2012 -0600
@@ -1091,24 +1091,46 @@
 valret	puls  y,pc
 
 		
+
+*VectCode bra   SWI3Jmp		$0100
+*         nop
+*         bra   SWI2Jmp		$0103
+*         nop
+*         bra   FIRQJmp		$0106
+*         nop
+*         bra   IRQJmp		$0109
+*         nop
+*         bra   SWIJmp		$010C
+*         nop
+*         bra   NMIJmp		$010F
+
+*SWI3Jmp  jmp   [>D.SWI3]
+*SWI2Jmp  jmp   [>D.SWI2]
+*FIRQJmp  jmp   [>D.FIRQ]
+*IRQJmp   jmp   [>D.IRQ]
+*SWIJmp   jmp   [>D.SWI]
+*NMIJmp   jmp   [>D.NMI]
+*VectCSz  equ   *-VectCode
+
+
 VectCode bra   SWI3Jmp		$0100
          nop
          bra   SWI2Jmp		$0103
          nop
-         bra   FIRQJmp		$0106
+         bra   SWIJmp		$0106
          nop
-         bra   IRQJmp		$0109
+         bra   NMIJmp		$0109
          nop
-         bra   SWIJmp		$010C
+         bra   IRQJmp		$010C
          nop
-         bra   NMIJmp		$010F
+         bra   FIRQJmp		$010F
 
 SWI3Jmp  jmp   [>D.SWI3]
 SWI2Jmp  jmp   [>D.SWI2]
-FIRQJmp  jmp   [>D.FIRQ]
-IRQJmp   jmp   [>D.IRQ]
 SWIJmp   jmp   [>D.SWI]
 NMIJmp   jmp   [>D.NMI]
+IRQJmp   jmp   [>D.IRQ]
+FIRQJmp  jmp   [>D.FIRQ]
 VectCSz  equ   *-VectCode
 
 
@@ -1193,10 +1215,10 @@
          fdb   $0000				RESERVED
 		 fdb   $0100				SWI3
 		 fdb   $0103				SWI2
-		 fdb   $0106				FIRQ
-		 fdb   $0109				IRQ
-		 fdb   $010C				SWI
-		 fdb   $010F				NMI
+		 fdb   $010F				FIRQ
+		 fdb   $010C				IRQ
+		 fdb   $0106				SWI
+		 fdb   $0109				NMI
          IFP2
          fdb   $10000-eomem+OS9Cold                 RESET         
          ELSE