github/AmigaExamples
1
0
Fork 0
mirror of https://github.com/alpine9000/amiga_examples synced 2025-12-08 14:59:01 +00:00
Code Issues Releases Wiki Activity

Removed hard coded hack that crashed on many amiga configs

Browse Source
This commit is contained in:
alpine9000
2016-03-25 15:04:57 +11:00
parent 089f4a5a79
commit 7de85e25a8
3 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
023.slideshow/Makefile
+3 -2
View File
@@ -5,7 +5,8 @@ INTERLACE=1
HAM_MODE=1 HAM_MODE=1
USERSTACK_ADDRESS=7fffc # userstack used by bootblock USERSTACK_ADDRESS=7fffc # userstack used by bootblock
BASE_ADDRESS=800 # if you change this you must also change link.script.x BASE_ADDRESS=4000 # if you change this you must also change link.script.x
# note: this must be high enough not to conflict with MFMbufE
BOOTBLOCK_ASM=alpine_bootblock.s BOOTBLOCK_ASM=alpine_bootblock.s
OBJS=out/init.o out/utils.o out/trackloader.o out/image.o out/module.o out/disk.o out/data.o OBJS=out/init.o out/utils.o out/trackloader.o out/image.o out/module.o out/disk.o out/data.o
@@ -41,7 +42,7 @@ else
FLAGS=--height=256 FLAGS=--height=256
endif endif
#SYMBOL_INFO=-M SYMBOL_INFO=-M
#LINK_COMMANDLINE=vlink -T link.script.x -brawbin1 $< $(OBJS) $(SYMBOL_INFO) -osec=out/main && cat out/main.load out/main.photo > out/main.bin #LINK_COMMANDLINE=vlink -T link.script.x -brawbin1 $< $(OBJS) $(SYMBOL_INFO) -osec=out/main && cat out/main.load out/main.photo > out/main.bin
LINK_COMMANDLINE=vlink -T link.script.x -brawbin1 $< $(OBJS) $(SYMBOL_INFO) -o out/main.bin LINK_COMMANDLINE=vlink -T link.script.x -brawbin1 $< $(OBJS) $(SYMBOL_INFO) -o out/main.bin
023.slideshow/alpine_bootblock.s
+7 -3
View File
@@ -33,15 +33,20 @@ BootCode: ;gathers some data, turns off OS, copies itself to $100
;from floppy. No GetVBR needed. ;from floppy. No GetVBR needed.
*--- Fastmem available? ---* *--- Fastmem available? ---*
if 1
move.l #$20004,d1 ;fast+largest move.l #$20004,d1 ;fast+largest
else
move.l #$20002,d1 ;chip+largest
endif
jsr -216(a6) ;AvailMem() jsr -216(a6) ;AvailMem()
move.l d0,d5 move.l d0,d5
sub.l #2048,d5 ;leave room for stacks to grow sub.l #2048,d5 ;leave room for stacks to grow
moveq #4,d1 moveq #4,d1
jsr -198(a6) ;AllocMem() jsr -198(a6) ;AllocMem()
and.l #-8,d0 and.l #-8,d0
move.l d0,a5 ;Start Address move.l d0,a5 ;Start Address
*--- OS off ---* ;you're nice'n all, but now you die. *--- OS off ---* ;you're nice'n all, but now you die.
lea $dff002,a6 ;Loader uses this custom base addr lea $dff002,a6 ;Loader uses this custom base addr
@@ -336,8 +341,7 @@ BootE:
cnop 0,1024 cnop 0,1024
;MFMbuf is placed here after bootblock end, $3c0.w or so when copied. ;MFMbuf is placed here after bootblock end, $3c0.w or so when copied.
MFMbuf equ $E0000 MFMbuf equ LoaderVars+(BootE-CopyStart)
;; MFMbuf equ LoaderVars+(BootE-CopyStart)
MFMbufE equ MFMbuf+MFMlen ;lowest free address. $372e for a full bootblock. MFMbufE equ MFMbuf+MFMlen ;lowest free address. $372e for a full bootblock.
mainStart: mainStart:
023.slideshow/link.script.x
+1 -1
View File
@@ -1,6 +1,6 @@
MEMORY MEMORY
{ {
disk: org = 0x800, len = 0xDB800 disk: org = 0x4000, len = 901120-0x4000
ram: org = 0x00000, len = 0x80000 ram: org = 0x00000, len = 0x80000
} }