diff options
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/mac68k/mac68k/locore.s | 12 | ||||
| -rw-r--r-- | sys/arch/mac68k/mac68k/macglobals.s | 17 |
2 files changed, 10 insertions, 19 deletions
diff --git a/sys/arch/mac68k/mac68k/locore.s b/sys/arch/mac68k/mac68k/locore.s index 077b7929657..b9f5f721a3e 100644 --- a/sys/arch/mac68k/mac68k/locore.s +++ b/sys/arch/mac68k/mac68k/locore.s @@ -1,4 +1,4 @@ -/* $OpenBSD: locore.s,v 1.44 2004/12/30 21:28:48 miod Exp $ */ +/* $OpenBSD: locore.s,v 1.45 2005/09/13 14:05:49 martin Exp $ */ /* $NetBSD: locore.s,v 1.103 1998/07/09 06:02:50 scottr Exp $ */ /* @@ -85,7 +85,15 @@ .text GLOBAL(kernel_text) -#include <mac68k/mac68k/macglobals.s> +/* + * Mac OS global variable space; storage for global variables used by + * Mac ROM traps and glue routines (see macrom.c, macrom.h macromasm.s) + * + * Some routine running before ADBReInit chooses to write to 0x1fb8. + * With the trap table from 0x0 to 0x3ff, this additional space of + * 0x2a00 should be sufficient. + */ + .space 0x2a00 /* * Initialization diff --git a/sys/arch/mac68k/mac68k/macglobals.s b/sys/arch/mac68k/mac68k/macglobals.s deleted file mode 100644 index 087e2d94f83..00000000000 --- a/sys/arch/mac68k/mac68k/macglobals.s +++ /dev/null @@ -1,17 +0,0 @@ -/* $OpenBSD: macglobals.s,v 1.4 2005/09/12 15:17:52 martin Exp $ */ -/* $NetBSD: macglobals.s,v 1.4 1997/09/16 16:13:47 scottr Exp $ */ - -/* Copyright 1994 by Bradley A. Grantham, All rights reserved */ - -/* - * Mac OS global variable space; storage for global variables used by - * Mac ROM traps and glue routines (see macrom.c, macrom.h macromasm.s) - */ - .text - .space 0x2a00 - -/* - * changed from 0xf00 to 0x2a00 as some routine running before ADBReInit - * chooses to write to 0x1fb8. With the trap table from 0x0 to 0x3ff, - * this additional space of 0x2a00 should be sufficient (WRU) - */ |