Changeset 3370595 in buchla-68k for rom

Timestamp:

08/07/2017 03:19:26 PM (7 years ago)

Author:

Thomas Lopatic <thomas@…>

Branches:

master

Children:

16badfe

Parents:

27c8d40

Message:

Fix symbol collisions.

Location:

rom

Files:

• bios.s (modified) (5 diffs)
• lowram.s (modified) (3 diffs)

rom/bios.s

@@ -467 +467 @@
 
                 move.l  #rsarea,savptr          | Setup pointer to register area
-                move.l  #RSMAGIC,_rsflag        | Set magic in _rsflag
+                move.l  #RSMAGIC,rsflag         | Set magic in rsflag
 
                 move.l  #nullrts,timevec        | Set timer interrupt vector
@@ -505 +505 @@
                 move.l  #nullrte,0x007C         | Set level 7 vector
 
-                move.l  #trap13,0x00B4          | Set trap13 vector
-                move.l  #trap14,0x00B8          | Set trap14 vector
+                move.l  #trap13_,0x00B4         | Set trap13 vector
+                move.l  #trap14_,0x00B8         | Set trap14 vector
 
                 .page
@@ -704 +704 @@
                 move.l  #rsarea,savptr          | Restore system save pointer
                 move.l  #SSTACK,a7              | Reset the stack pointer
-                move.l  #RSMAGIC,_rsflag        | ... and the stack sentinel
+                move.l  #RSMAGIC,rsflag         | ... and the stack sentinel
                 trap    #15                     | TRAP to ROMP
 
@@ -805 +805 @@
                 .page
 
-| trap14 -- Extended BIOS entry point
-| ------    -------------------------
-trap14:         lea     t14tab,a0               | Setup trap 14 table address
+| trap14_ -- Extended BIOS entry point
+| -------    -------------------------
+trap14_:        lea     t14tab,a0               | Setup trap 14 table address
                 bra     trapent                 | Go process trap
 
-| trap13 -- Main BIOS entry point
-| ------    ---------------------
-trap13:         lea     t13tab,a0               | Setup trap 13 table address
+| trap13_ -- Main BIOS entry point
+| -------    ---------------------
+trap13_:        lea     t13tab,a0               | Setup trap 13 table address
 
 trapent:        move.l  savptr,a1               | Get save area pointer
@@ -3732 +3732 @@
 savptr:         .ds.l   1               | Pointer to register save area
 
-_rsflag:        .ds.l   1               | Register save area overflow flag
+rsflag:         .ds.l   1               | Register save area overflow flag
                 .ds.l   18*32           | Register save area  (32 levels)
 rsarea:         .ds.l   1               | Dummy long word at top of save area

rom/lowram.s

@@ -79 +79 @@
 | The equate for HI_RAM must be set to match the memory configuration used.
 
-|       For a  512K system, _Hi_RAM = 0x080000
-|       For a 1024K system, _Hi_RAM = 0x100000
+|       For a  512K system, Hi_RAM = 0x080000
+|       For a 1024K system, Hi_RAM = 0x100000
 
-_Hi_RAM         =       0x100000                | highest RAM address + 1
+Hi_RAM          =       0x100000                | highest RAM address + 1
 
                 .page
@@ -91 +91 @@
 LOWRAM:         lea     basebss,a0              | setup bss base
                 move.l  a0,p_bbase              | ...
-                lea     _Hi_RAM-0x400,a1        | setup faked bss length
+                lea     Hi_RAM-0x400,a1         | setup faked bss length
                 suba.l  a0,a1                   | ...
                 move.l  a1,p_blen               | ...
@@ -107 +107 @@
                 move.l  a1,p_tlen               | ...
 
-                lea     _Hi_RAM,a7              | setup stack pointer
+                lea     Hi_RAM,a7               | setup stack pointer
 
                 lea     p_lowtpa,a0             | setup TPA base