From: cuz <cuz@b7a2c559-68d2-44c3-8de9-860c34a00d81>
Date: Fri, 1 Apr 2005 08:23:56 +0000 (+0000)
Subject: Renamed O65_OS_CC65_MODULE -> O65_OS_CC65 in the headers.
X-Git-Tag: V2.12.0~394
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=624c808dbcc65bba62d18af672cb883005f56754;p=cc65

Renamed O65_OS_CC65_MODULE -> O65_OS_CC65 in the headers.
Squeezed one precious byte out of the loader code:-)


git-svn-id: svn://svn.cc65.org/cc65/trunk@3445 b7a2c559-68d2-44c3-8de9-860c34a00d81
---

diff --git a/libsrc/common/modload.s b/libsrc/common/modload.s
index ac04a3987..63776f1c8 100644
--- a/libsrc/common/modload.s
+++ b/libsrc/common/modload.s
@@ -200,17 +200,16 @@ CleanupAndExit:
 
 ; Check if we have to free the allocated block
 
-        lda     Module
-        ora     Module+1
-        beq     @L1                     ; Jump if no memory allocated
-
         lda     Module
         ldx     Module+1
-        jsr     _free                   ; Free the allocated block
+        bne     @L1
+        tay                             ; Test high byte
+        beq     @L2
+@L1:    jsr     _free                   ; Free the allocated block
 
 ; Restore the register bank
 
-@L1:    jsr     RestoreRegBank
+@L2:    jsr     RestoreRegBank
 
 ; Restore the  error code and return to the caller
 
@@ -390,7 +389,7 @@ Opt:    jsr     ReadByte                ; Read the length byte
         bne     OSError
 
         jsr     ReadByte                ; Get the operating system
-        cmp     #O65_OS_CC65_MODULE
+        cmp     #O65_OS_CC65
         bne     OSError                 ; Wrong operating system
 
         jsr     ReadByte                ; Get the version number, expect zero