From 79793b78a412fc08815e4b2417fc79d8e6757a20 Mon Sep 17 00:00:00 2001
From: apple2geek <github@apple2geeks.com>
Date: Thu, 6 Oct 2022 21:09:29 -0600
Subject: [PATCH] Complete "SYSTEM"-ification of Applecorn. Now runs as
 APLCORN.SYSTEM, without the need for BASIC.SYSTEM as a support for .BIN.

---
 applecorn.po  | Bin 819200 -> 819200 bytes
 applecorn.s   |   4 ++--
 auxmem.init.s |   2 +-
 auxmem.misc.s |   2 +-
 m32build      |   6 ++---
 mainmem.ldr.s |  60 ++++++++++++++++++++++++++++++++++++++++++++++++++
 6 files changed, 67 insertions(+), 7 deletions(-)

diff --git a/applecorn.po b/applecorn.po
index 4755c0dbb731b80aa7a475a869556bb5fe3874bb..913c992933c1d866aaaf8d358ae57ebe683e5a99 100644
GIT binary patch
delta 103
zcmZo@FluNp+Mvq9C_Gt>MTe1LaxjY;Bg5t@mTq=-`~Uyz|Ns9mnUN`Yay*Y0E0F*H
sfAcz?_H{grK+FWh%s|Wn#H>Kf2E^<@%mKulK+FZi+}qdj@B|eD0CIvPz5oCK

delta 103
zcmZo@FluNp+Mvq9C^}h<MTb#maxjY;qvqx+mTq=-1_p-u|NlQsW@HMU9M9v$3gk1?
rH?QMqU&q4;#7scU48$xz%nHP8K+F!r96-zo#9Tnky?q@IPf#%c8`mEk

diff --git a/applecorn.s b/applecorn.s
index 6d1806f..e1fcac1 100644
--- a/applecorn.s
+++ b/applecorn.s
@@ -10,7 +10,7 @@
 
 
             XC                ; 65c02
-            ORG   $4000       ; Load addr of loader in main memory
+            ORG   $2000       ; Load addr of loader in main memory
                               ; Clear of first HGR frame buffer
 
 * Monitor routines
@@ -200,6 +200,6 @@ MAINZP      MAC
             PUT   AUXMEM.MISC
 
 * Automatically save the object file:
-            SAV   APPLECORN
+            SAV   APLCORN.SYSTEM
 
 
diff --git a/auxmem.init.s b/auxmem.init.s
index efb11b4..498edfa 100644
--- a/auxmem.init.s
+++ b/auxmem.init.s
@@ -209,7 +209,7 @@ BYTE00      BEQ   BYTE00A                    ; OSBYTE 0,0 - generate error
             RTS                              ; %000x1xxx host type, 'A'pple
 BYTE00A     BRK
             DB    $F7
-HELLO       ASC   'Applecorn MOS 2022-09-24'
+HELLO       ASC   'Applecorn MOS 2022-10-06-SYS'
             DB    $00                        ; Unify MOS messages
 GSSPEED     DB    $00                        ; $80 if GS is fast, $00 for slow
 
diff --git a/auxmem.misc.s b/auxmem.misc.s
index 01c3529..8cdc49f 100644
--- a/auxmem.misc.s
+++ b/auxmem.misc.s
@@ -727,7 +727,7 @@ MOSVEND
 
 * Buffer for one 512 byte disk block in aux mem
 AUXBLK      ASC   '**ENDOFCODE**'
-            DS    $200-13
+;            DS    $200-13
 
 
 
diff --git a/m32build b/m32build
index 1ff67e3..c0c57b2 100755
--- a/m32build
+++ b/m32build
@@ -4,6 +4,6 @@
 #
 
 merlin32 -v applecorn.s
-cp APPLECORN APPLECORN#064000
-cadius deletefile applecorn.po /APPLECORN/APPLECORN
-cadius addfile applecorn.po /APPLECORN APPLECORN#064000
+cp APLCORN.SYSTEM APLCORN.SYSTEM#FF2000
+cadius deletefile applecorn.po /APPLECORN/APLCORN.SYSTEM
+cadius addfile applecorn.po /APPLECORN APLCORN.SYSTEM#FF2000
diff --git a/mainmem.ldr.s b/mainmem.ldr.s
index d329443..7e17d1b 100644
--- a/mainmem.ldr.s
+++ b/mainmem.ldr.s
@@ -11,6 +11,66 @@
 * to aux memory starting at AUXMOS1 and jumps to it.
 * (Note that the MOS code will copy itself to $D000.)
 
+SYSTEM      LDX   #$FF             ; Init stack pointer
+            TXS
+
+            LDA   #$00
+            STA   $BFFC            ; IBAKVER (minimum P8 version)
+            LDA   #$01
+            STA   $BFFD            ; IVERSION (version of me)
+
+            SED                    ; Check for 65C02
+            LDA   #$99
+            CLC
+            ADC   #$01
+            CLD
+            BPL   GOODCPU
+            JMP   UNSUPPORTED
+
+GOODCPU     LDA   $BF98            ; MACHID
+            AND   #$F2             ; Clear bits 0,2,3
+            CMP   #$B2             ; Are we on a //e or //c w/ 80col and 128K or a IIgs?
+            BEQ   SUPPORTED        ; Supported machine
+            JMP   UNSUPPORTED      ; Unsupported machine
+
+SUPPORTED   LDA   #$DF             ; Protect pages $0,$1,and $3-$7
+            STA   $BF58
+            LDA   #$F0             ; Protect pages $8-$B
+            STA   $BF59
+            LDA   #$FF             ; Protect HGR1
+            STA   $BF5C
+            STA   $BF5D
+            STA   $BF5E
+            STA   $BF5F
+            JMP   START
+
+UNSUPPORTED JSR   HOME
+            LDX   #$00
+UNSUPLP     LDA   UNSUPMSG,X
+            BEQ   UNSUPWAIT
+            JSR   COUT1
+            INX
+            BNE   UNSUPLP
+UNSUPWAIT   STA   $C010
+UNSUPKEY    LDA   $C000
+            BPL   UNSUPKEY
+            STA   $C010
+
+            JSR   MLI
+            DB    QUITCMD
+            DW    UNSUPQPARM
+UNSUPQPARM  DB    $04,$00,$00,$00,$00,$00,$00
+
+UNSUPMSG    ASC   "APPLECORN REQUIRES AN APPLE IIGS, APPLE"
+            ASC   "//C, OR ENHANCED APPLE //E WITH AN", 8D
+            ASC   "80-COLUMN CARD AND AT LEAST 128K", 8D, 8D
+            ASC   "PRESS ANY KEY TO QUIT TO PRODOS", 00
+
+PADDING     ASC   '***THISISPROTOTYPECODE***'
+            DS    $4000-*
+
+; Original APPLECORN.BIN code starts here
+
 START       JSR   CROUT
             JSR   SETPRFX
             JSR   DISCONN