Use labels instead of segment load addresses to specify entry points

in the EXE file.

diff --git a/libsrc/atari/crt0.s b/libsrc/atari/crt0.s
index eb5de1f40b29c24f0375a619c36c04a580e1e7c5..e30d7c07fbd214c2fecacec981fdedf0010b49f8 100644 (file)
--- a/libsrc/atari/crt0.s
+++ b/libsrc/atari/crt0.s
@@ -52,6 +52,8 @@
 
 ; Real entry point:
 
+start:
+
 .if .defined(__ATARIXL__)
         jsr     sram_init
 .endif
@@ -229,4 +231,4 @@ APPMHI_save:    .res    2
 .segment "AUTOSTRT"
         .word   RUNAD                   ; defined in atari.inc
         .word   RUNAD+1
-        .word   __STARTUP_LOAD__ + 1
+        .word   start

diff --git a/libsrc/atari/shadow_ram_prepare.s b/libsrc/atari/shadow_ram_prepare.s
index dd8b2c0da34de09b62e9936832363338226e8182..78e7ba4f0de5c103cc9413c407b89cb78aef6cc8 100644 (file)
--- a/libsrc/atari/shadow_ram_prepare.s
+++ b/libsrc/atari/shadow_ram_prepare.s
@@ -374,6 +374,6 @@ screen_device_length = * - screen_device
 
         .word   INITAD
         .word   INITAD+1
-        .word   __SRPREP_LOAD__
+        .word   sramprep
 
 .endif  ; .if .defined(__ATARIXL__)

diff --git a/libsrc/atari/system_check.s b/libsrc/atari/system_check.s
index ee74809220ce2b5749517fac0fed9178f7642e5c..2baa5d19c7f872a2f75085817a33801e587ade74 100644 (file)
--- a/libsrc/atari/system_check.s
+++ b/libsrc/atari/system_check.s
@@ -71,17 +71,17 @@ cont:       ldx     #0              ; channel 0
 
 .segment        "SYSCHK"
 
+; no XL machine
+no_xl: print_string "This program needs an XL machine."
+       jmp     fail
+
 syschk:
        lda     $fcd8           ; from ostype.s
         cmp     #$a2
-        bne     is_xl
-
-; no XL machine
-       print_string "This program needs an XL machine."
-       jmp     fail
+        beq     no_xl
 
 ; we have an XL machine, now check memory
-is_xl: lda     RAMSIZ
+       lda     RAMSIZ
        cmp     #$80
        bcs     sys_ok
 
@@ -148,6 +148,6 @@ loop:       dey
 trailer:
         .word   INITAD
         .word   INITAD+1
-        .word   __SYSCHK_LOAD__
+        .word   syschk
 
 .endif ; .if .defined(__ATARIXL__)