github/AmigaExamples
1
0
Fork 0
mirror of https://frontier.innolan.net/github/AmigaExamples.git synced 2026-09-12 09:01:24 +00:00
Code Releases Activity

Removed -phxass assembler argument

Browse Source
This commit is contained in:
alpine9000
2016-03-20 21:11:56 +11:00
parent 5ee2b42a30
commit 2da8e747dc
20 changed files with 77 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files
shared/base.mk
+7 -4
View File
@@ -11,6 +11,9 @@ RESIZE=$(RESIZEDIR)/out/resize
A500_RUN_SCRIPT=~/Google\ Drive/Amiga/amiga500.sh
A600_RUN_SCRIPT=~/Google\ Drive/Amiga/amiga600.sh
#VASM_ARGS=-phxass -Fhunk -quiet -spaces
VASM_ARGS=-Fhunk -quiet -esc
ifndef FLOPPY
FLOPPY=bin/$(EXAMPLE_NAME).adf
endif
@@ -41,7 +44,7 @@ ifndef BOOTBLOCK_ASM
BOOTBLOCK_ASM=../shared/shrinkler_bootblock.s
endif
PROGRAM_BIN=out/shrunk.bin
VASM_EXTRA_BOOTBLOCK_ARGS=-DDECOMPRESS_ADDRESS="\$$$(DECOMPRESS_ADDRESS)" -DSHRINKLER=$(SHRINKLER)
VASM_EXTRA_BOOTBLOCK_ARGS=-DSHRINKLER=$(SHRINKLER) -DDECOMPRESS_ADDRESS="\$$$(DECOMPRESS_ADDRESS)"
else
ifndef BOOTBLOCK_ASM
BOOTBLOCK_ASM=../shared/bootblock.s
@@ -97,13 +100,13 @@ out/bootblock.bin: out/bootblock.o
vlink -brawbin1 $< -o $@
out/bootblock.o: $(BOOTBLOCK_ASM) $(PROGRAM_BIN)
vasmm68k_mot $(VASM_EXTRA_BOOTBLOCK_ARGS) -DUSERSTACK_ADDRESS="\$$$(USERSTACK_ADDRESS)" -DBASE_ADDRESS="\$$$(BASE_ADDRESS)" -Fhunk -phxass -opt-fconst -nowarn=62 -quiet $< -o $@ -I/usr/local/amiga/os-include
vasmm68k_mot $(VASM_ARGS) $(VASM_EXTRA_BOOTBLOCK_ARGS) -DUSERSTACK_ADDRESS="\$$$(USERSTACK_ADDRESS)" -DBASE_ADDRESS="\$$$(BASE_ADDRESS)" $< -o $@ -I/usr/local/amiga/os-include
out/main.o: $(MODULE) $(EXTRA)
vasmm68k_mot $(VASM_EXTRA_ARGS) -Fhunk -phxass -opt-fconst -nowarn=62 -quiet $< -o $@ -I/usr/local/amiga/os-include
vasmm68k_mot $(VASM_ARGS) $(VASM_EXTRA_ARGS) $< -o $@ -I/usr/local/amiga/os-include
out/%.o: %.s
vasmm68k_mot $(VASM_EXTRA_ARGS) -Fhunk -phxass -opt-fconst -nowarn=62 -quiet $< -o $@ -I/usr/local/amiga/os-include
vasmm68k_mot $(VASM_ARGS) $(VASM_EXTRA_ARGS) $< -o $@ -I/usr/local/amiga/os-include
out/%.o: %.c
vc -O3 -c $< -o $@
shared/hardware_bootblock.s
+9 -9
View File
@@ -96,21 +96,21 @@ LoadScript: ;At $120, sysinfo in 4 regs, a6=$dff002
*--- load first part ---*
if SHRINKLER == 1
if SHRINKLER==1
lea DECOMPRESS_ADDRESS,a0 ; load shrinkler compressed data here
else
lea BASE_ADDRESS,a0 ; main entry point
endif
moveq #2,d0 ;from sector 2
move.w #-((mainEnd-mainStart)/512),d1;num sectors, - == Step0
move.w #-((mainEnd-mainStart)/512),d1;num sectors, - ==Step0
jsr LoadMFMB
lea $dff000,a6 ;restore plain custombase addr for demo
if SHRINKLER == 0
if SHRINKLER==0
jmp (a0) ; -> main entry point
else ; SHRINKER == 1
else ; SHRINKER==1
; a0 = compressed data
lea DECOMPRESS_ADDRESS,a0
@@ -131,7 +131,7 @@ CompressCallback:
move.l (sp)+,a6
rts
endif ; SHRINKLER == 1
endif ; SHRINKLER==1
@@ -337,7 +337,7 @@ NullCop:
dc.w $ffdf,$fffe
dc.l -2
if SHRINKLER == 1
if SHRINKLER==1
include "../tools/external/shrinkler/ShrinklerDecompress.S"
endif
BootE:
@@ -353,15 +353,15 @@ MFMbuf equ LoaderVars+(BootE-CopyStart)
MFMbufE equ MFMbuf+MFMlen ;lowest free address. $372e for a full bootblock.
mainStart:
if SHRINKLER == 1
if SHRINKLER==1
incbin "out/shrunk.bin"
else ; SHRINKLER == 0
else ; SHRINKLER==0
incbin "out/main.bin"
endif ; SHRINKLER == 0
endif ; SHRINKLER==0
cnop 0,512
mainEnd:
end
shared/shrinkler_bootblock.s
+7 -8
View File
@@ -14,7 +14,7 @@ BootEntry:
;; a6 = exec base
;; a1 = trackdisk.device I/O request pointer
if SHRINKLER == 1
if SHRINKLER==1
lea DECOMPRESS_ADDRESS,a5 ; load shrinkler compressed data here
else
lea BASE_ADDRESS,a5 ; main.s entry point
@@ -32,11 +32,10 @@ BootEntry:
move.w #TD_MOTOR,IO_COMMAND(a1)
jsr _LVODoIO(a6)
if SHRINKLER == 0
if SHRINKLER==0
jmp (a5) ; -> main.s entry point
else ; SHRINKER == 1
else ; SHRINKER==1
; a0 = compressed data
lea DECOMPRESS_ADDRESS,a0
@@ -59,21 +58,21 @@ Callback:
move.l (sp)+,a6
rts
endif ; SHRINKLER == 1
endif ; SHRINKLER==1
;; Pad the remainder of the bootblock
cnop 0,1024
mainStart:
if SHRINKLER == 1
if SHRINKLER==1
incbin "out/shrunk.bin"
else ; SHRINKLER == 0
else ; SHRINKLER==0
incbin "out/main.bin"
endif ; SHRINKLER == 0
endif ; SHRINKLER==0
cnop 0,512
mainEnd:
end