[haiku-commits] r38933 - haiku/trunk/src/system/boot/platform/amiga_m68k
- From: revol@xxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Sun, 10 Oct 2010 16:18:05 +0200 (CEST)
Author: mmu_man
Date: 2010-10-10 16:18:05 +0200 (Sun, 10 Oct 2010)
New Revision: 38933
Changeset: http://dev.haiku-os.org/changeset/38933
Modified:
haiku/trunk/src/system/boot/platform/amiga_m68k/shell.S
Log:
Comment out atari stuff.
Initialize SysBase and IntuitionBase that will be needed by C++ code.
Modified: haiku/trunk/src/system/boot/platform/amiga_m68k/shell.S
===================================================================
--- haiku/trunk/src/system/boot/platform/amiga_m68k/shell.S 2010-10-10
14:15:10 UTC (rev 38932)
+++ haiku/trunk/src/system/boot/platform/amiga_m68k/shell.S 2010-10-10
14:18:05 UTC (rev 38933)
@@ -94,13 +94,25 @@
movem.l %d1-%d7/%a0-%a6,-(%sp)
// seems like a6 is already set to ExecBase when called from the ROM ?
- // copy it
- move.l 4.w,%a6
- lea _execbase(%pc),%a2
+ move.l 4.w,%a6 // exec base
+ jsr _FindResident(%a6)
+ lea SysBase(%pc),%a2
move.l %a6,(%a2)
- //
+// lea dosname_boot(%pc),%a1
+// move.l 4.w,%a6 // exec base
+// jsr _FindResident(%a6)
+// lea DosBase(%pc),%a2
+// tst.l %d0
+// beq.s _floppy_err
+// move.l %d0,(%a2)
+ lea intname_boot(%pc),%a1
+ jsr _FindResident(%a6)
+ tst.l %d0
+ beq.s _floppy_err
+ lea IntuitionBase(%pc),%a2
+ move.l %d0,(%a2)
@@ -127,19 +139,13 @@
_display_alert:
- move.l 4.w,%a6
- lea intname_boot(%pc),%a1
- jsr _OldOpenLibrary(%a6)
- tst.l %d0
- beq.s _floppy_err
- lea _intbase(%pc),%a2
- move.l %d0,(%a2)
- move.l %d0,%a6
-
+ move.l %a6,-(%sp)
+ move IntuitionBase,%a6
lea alert_data(%pc),%a0
moveq #0,%d0
move.l #30,%d1
jsr _DisplayAlert(%a6)
+ move.l (%sp)+,%a6
rts
@@ -465,11 +471,11 @@
.ascii "\0\0"
.byte 0
-_execbase:
+GLOBAL(SysBase):
.long 0
-_dosbase:
+GLOBAL(DosBase):
.long 0
-_intbase:
+GLOBAL(IntuitionBase):
.long 0
end_buff:
@@ -484,6 +490,8 @@
* \AUTO\HAIKU.PRG and ARAnyM BOOTSTRAP() support code
*/
+#if 0
+
prg_start:
lea label_prg,%a0
bsr puts
@@ -553,6 +561,7 @@
move.b #1,AMIGA_ZBEOS_BASE + gBootedFromImage - _bs_entry
move.l #0,%d0
+#endif
//jmp AMIGA_ZBEOS_BASE+512
jmp _start
Other related posts:
- » [haiku-commits] r38933 - haiku/trunk/src/system/boot/platform/amiga_m68k - revol
