diff --git a/src/libsrc/fiber.pla b/src/libsrc/fiber.pla index 85fe167..4d3be2d 100644 --- a/src/libsrc/fiber.pla +++ b/src/libsrc/fiber.pla @@ -23,12 +23,12 @@ byte fbrRunning = 0 // Zero Page VM state and 6502 stack // struc t_vm - byte estklo[$10] byte estkhi[$10] - byte esp + byte estklo[$10] word ifp word pp byte hwsp + byte esp byte fill[9] byte dropop byte nextop[$10] diff --git a/src/makefile b/src/makefile index 90675c8..787ac0e 100755 --- a/src/makefile +++ b/src/makefile @@ -43,8 +43,6 @@ ROGUEMAP= ROGUEMAP\#FE1000 ROGUECOMBAT= ROGUECOMBAT\#FE1000 HELLO = HELLO\#FE1000 MON = MON\#FE1000 -HGR1 = HGR1\#FE1000 -HGR1TEST= HGR1TEST\#FE1000 DGRTEST = DGRTEST\#FE1000 TEST = TEST\#FE1000 TESTLIB = TESTLIB\#FE1000 @@ -75,7 +73,7 @@ TXTTYPE = .TXT #SYSTYPE = \#FF2000 #TXTTYPE = \#040000 -all: $(PLASM) $(PLVM) $(PLVM01) $(PLVM02) $(PLVM802) $(PLVM03) $(CMD) $(PLASMAPLASM) $(CODEOPT) $(ARGS) $(MEMMGR) $(MEMTEST) $(FIBER) $(FIBERTEST) $(LONGJMP) $(ED) $(MON) $(ROD) $(SIEVE) $(UTHERNET2) $(UTHERNET) $(ETHERIP) $(INET) $(DHCP) $(HTTPD) $(ROGUE) $(ROGUEMAP) $(ROGUECOMBAT) $(ROGUEIO) $(HGR1) $(TONE) $(DGR) $(DGRTEST) $(FILEIO) $(CONIO) $(PORTIO) $(SPIPORT) $(SDFAT) $(FATCAT) $(FATGET) $(FATPUT) $(FATWDSK) $(FATRDSK) $(SANE) $(FPSTR) $(FPU) $(SANITY) $(RPNCALC) $(SNDSEQ) $(PLAYSEQ) +all: $(PLASM) $(PLVM) $(PLVM01) $(PLVM02) $(PLVM802) $(PLVM03) $(CMD) $(PLASMAPLASM) $(CODEOPT) $(ARGS) $(MEMMGR) $(MEMTEST) $(FIBER) $(FIBERTEST) $(LONGJMP) $(ED) $(MON) $(ROD) $(SIEVE) $(UTHERNET2) $(UTHERNET) $(ETHERIP) $(INET) $(DHCP) $(HTTPD) $(ROGUE) $(ROGUEMAP) $(ROGUECOMBAT) $(ROGUEIO) $(TONE) $(DGR) $(DGRTEST) $(FILEIO) $(CONIO) $(PORTIO) $(SPIPORT) $(SDFAT) $(FATCAT) $(FATGET) $(FATPUT) $(FATWDSK) $(FATRDSK) $(SANE) $(FPSTR) $(FPU) $(SANITY) $(RPNCALC) $(SNDSEQ) $(PLAYSEQ) clean: -rm *FE1000 *FF2000 $(PLASM) $(PLVM) $(PLVM01) $(PLVM02) $(PLVM03) @@ -299,12 +297,6 @@ $(ROGUEMAP): samplesrc/rogue.map.pla $(PLVM02) $(PLASM) ./$(PLASM) -AMOW < samplesrc/rogue.map.pla > samplesrc/rogue.map.a acme --setpc 4094 -o $(ROGUEMAP) samplesrc/rogue.map.a -$(HGR1): samplesrc/hgr1.pla samplesrc/hgr1test.pla $(PLVM02) $(PLASM) - ./$(PLASM) -AMOW < samplesrc/hgr1test.pla > samplesrc/hgr1test.a - acme --setpc 4094 -o $(HGR1TEST) samplesrc/hgr1test.a - ./$(PLASM) -AMOW < samplesrc/hgr1.pla > samplesrc/hgr1.a - acme --setpc 4094 -o $(HGR1) samplesrc/hgr1.a - hello: samplesrc/hello.pla $(PLVM) $(PLASM) ./$(PLASM) -AMOW < samplesrc/hello.pla > samplesrc/hello.a acme --setpc 4094 -o $(HELLO) samplesrc/hello.a diff --git a/src/mkrel b/src/mkrel index ba20ee9..b6bc1e8 100755 --- a/src/mkrel +++ b/src/mkrel @@ -48,16 +48,19 @@ cp FATWRITEDSK#FE1000 prodos/demos/sdutils/FATWRITEDSK.REL mkdir prodos/demos/net cp HTTPD#FE1000 prodos/demos/net/HTTPD.REL +cp samplesrc/index.html prodos/demos/net/INDEX.HTML.TXT mkdir prodos/demos/music cp PLAYSEQ#FE1000 prodos/demos/music/PLAYSEQ.REL cp mockingboard/ultima3.seq prodos/demos/music/ULTIMA3.SEQ.BIN +cp mockingboard/startrek.seq prodos/demos/music/STARTREK.SEQ.BIN mkdir prodos/bld cp PLASM#FE1000 prodos/bld/PLASM.REL cp CODEOPT#FE1000 prodos/bld/CODEOPT.REL cp samplesrc/dgrtest.pla prodos/bld/DGRTEST.PLA.TXT cp samplesrc/hello.pla prodos/bld/HELLO.PLA.TXT +cp samplesrc/hgr1test.pla prodos/bld/HGR1TEST.PLA.TXT cp samplesrc/fibertest.pla prodos/bld/FIBERTEST.PLA.TXT cp samplesrc/mon.pla prodos/bld/MON.PLA.TXT cp samplesrc/memtest.pla prodos/bld/MEMTEST.PLA.TXT @@ -86,3 +89,4 @@ cp inc/sdfat.plh prodos/bld/inc/SDFAT.PLH.TXT cp inc/sndseq.plh prodos/bld/inc/SNDSEQ.PLH.TXT cp inc/spiport.plh prodos/bld/inc/SPIPORT.PLH.TXT cp inc/testlib.plh prodos/bld/inc/TESTLIB.PLH.TXT +cp vmsrc/plvmzp.inc prodos/bld/inc/PLVMZP.INC.TXT diff --git a/src/mockingboard/ultima3.seq b/src/mockingboard/ultima3.seq old mode 100755 new mode 100644 index 412c437..9e7d0aa Binary files a/src/mockingboard/ultima3.seq and b/src/mockingboard/ultima3.seq differ diff --git a/src/samplesrc/fibertest.pla b/src/samplesrc/fibertest.pla index cc806aa..3968e6d 100644 --- a/src/samplesrc/fibertest.pla +++ b/src/samplesrc/fibertest.pla @@ -9,7 +9,7 @@ def fbrTest(fid, param)#0 byte i for i = 1 to param - puth(fid); putc($0D) + puti(fid); putln fbrYield next end diff --git a/src/samplesrc/hgr1.pla b/src/samplesrc/hgr1.pla deleted file mode 100644 index d8d4ea4..0000000 --- a/src/samplesrc/hgr1.pla +++ /dev/null @@ -1,10 +0,0 @@ -include "inc/cmdsys.plh" - -sysflags reshgr1 // Reserve HGR page 1 - -memset($2000, 0, $2000) // Clear HGR page 1 -^$C054 -^$C052 -^$C057 -^$C050 -done diff --git a/src/samplesrc/hgr1test.pla b/src/samplesrc/hgr1test.pla index 33e43b1..f7ead33 100644 --- a/src/samplesrc/hgr1test.pla +++ b/src/samplesrc/hgr1test.pla @@ -1,9 +1,6 @@ include "inc/cmdsys.plh" -import HGR1 -end +sysflags reshgr1 // Reserve HGR page 1 -const view_height = 64 // scan count of ground view -const fix_bits = 8 // number of fixed point bits // // Hardware addresses // @@ -48,75 +45,11 @@ word = $02D0,$06D0,$0AD0,$0ED0,$12D0,$16D0,$1AD0,$1ED0 word = $0350,$0750,$0B50,$0F50,$1350,$1750,$1B50,$1F50 word = $03D0,$07D0,$0BD0,$0FD0,$13D0,$17D0,$1BD0,$1FD0 word hcolor[] = $0000,$552A,$2A55,$7F7F,$8080,$D5AA,$AAD5,$FFFF -word testval -// -// def draw_scan(d8p8, scanptr) -// -asm draw_scan(d8p8, scanptr)#0 - !SOURCE "vmsrc/plvmzp.inc" -WFIXL = $80 -WFIXH = $81 -WINT = $82 -PIX = $83 - LDA ESTKL,X - STA TMPL - LDA ESTKH,X - STA TMPH - LDA ESTKL+1,X - STA WFIXL - STA WFIXH - LDA ESTKH+1,X - LSR - STA WINT - ROR WFIXH - ROR WFIXL - LDA #$FF - SEC - SBC WFIXL - STA WFIXL - LDA #$FF - SBC WFIXH - STA WFIXH - LDA #$FF - SBC WINT - STA WINT - LDY #$01 - STY PIX - DEY -- EOR ESTKH+1,X - LSR - BCC + - LDA PIX - ORA (TMP),Y - STA (TMP),Y -+ ASL PIX - BPL + - SEC - ROL PIX - INY - CPY #36 - BEQ ++ -+ LDA ESTKL+1,X - ADC WFIXL - STA WFIXL - LDA ESTKH+1,X - ADC WFIXH - STA WFIXH - BCC - - INC WINT - BCS - -++ INX - INX - RTS -end -def draw_ground(page)#0 - byte ip - - for ip = 1 to view_height - draw_scan((127 << fix_bits) / ip, hgrpage[page] + hgrscan[ip + 191 - view_height] + 2) - next -end -draw_ground(page1) +memset($2000, 0, $2000) // Clear HGR page 1 +^showpage1 +^showfull +^showhires +^showgraphics getc ^showpage1 ^showtext diff --git a/src/samplesrc/index.html b/src/samplesrc/index.html new file mode 100755 index 0000000..5b16ba7 --- /dev/null +++ b/src/samplesrc/index.html @@ -0,0 +1,5 @@ + + +Hello from the Apple II! + + \ No newline at end of file