From 25398f0a0404b17128fbff48c34cd09de504c829 Mon Sep 17 00:00:00 2001 From: verhaegs Date: Mon, 23 Apr 2007 16:44:46 +0000 Subject: [PATCH] r4548@vps: verhaegs | 2007-04-23 10:55:24 -0400 Removed AROS_GET_SYSBASE, AROS_GET_SYSBASE_OK and AROS_GET_DOSBASE from cpu.h file and the source code. git-svn-id: https://svn.aros.org/svn/aros/trunk/AROS@25898 fb15a70f-31f2-0310-bbcc-cdcc74a49acc --- .../arm-all/Drivers/irq.hidd.sa1100/servers.c | 5 +---- arch/.unmaintained/arm-all/exec/cause.c | 2 -- arch/.unmaintained/arm-all/exec/core.c | 5 ----- arch/.unmaintained/arm-all/exec/idletask.c | 3 ++- arch/.unmaintained/arm-all/exec/init.c | 1 - arch/.unmaintained/arm-all/exec/setsr.c | 1 - arch/.unmaintained/arm-all/exec/tools.c | 5 +++-- .../m68k-pp-native/Drivers/irq.hidd/servers.c | 3 --- .../m68k-pp-native/Drivers/serial.hidd/SerialUnitClass.c | 4 ---- arch/.unmaintained/m68k-pp-native/exec/core.c | 5 ----- arch/.unmaintained/m68k-pp-native/exec/init.c | 1 - arch/.unmaintained/m68k-pp-native/exec/traps.c | 1 - arch/i386-all/include/aros/i386/cpu.h | 12 ++++-------- arch/m68k-mac/exec/core.c | 7 +------ arch/m68k-mac/exec/init.c | 3 +-- arch/m68k-mac/exec/traps.c | 3 +-- arch/m68k-mac/include/aros/m68k/cpu.h | 14 ++++---------- arch/ppc-all/include/aros/ppc/cpu.h | 12 ++++-------- arch/x86_64-all/include/aros/x86_64/cpu.h | 12 ++++-------- compiler/alib/checkrexxmsg.c | 3 +-- compiler/alib/createextio.c | 3 +-- compiler/alib/createport.c | 3 +-- compiler/alib/createtask.c | 3 +-- compiler/alib/deleteextio.c | 3 +-- compiler/alib/deleteport.c | 3 +-- compiler/alib/deletestdio.c | 4 +--- compiler/alib/deletetask.c | 3 +-- compiler/alib/domethod.c | 6 +----- compiler/alib/freeievents.c | 3 +-- compiler/alib/getrexxvar.c | 3 +-- compiler/alib/invertstring.c | 4 +--- compiler/alib/liballocpooled.c | 3 +-- compiler/alib/libcreatepool.c | 3 +-- compiler/alib/libdeletepool.c | 4 +--- compiler/alib/libfreepooled.c | 4 +--- compiler/alib/setrexxvar.c | 3 +-- compiler/alib/sprintf.c | 3 +-- compiler/alib/timedelay.c | 3 +-- compiler/arossupport/_kprintf.c | 4 +--- compiler/arossupport/debugmem.c | 3 +-- compiler/arossupport/freestruct.c | 3 +-- compiler/arossupport/hexdump.c | 3 +-- compiler/arossupport/kprintf.c | 3 +-- compiler/arossupport/purify.c | 5 +---- compiler/arossupport/rawputchars.c | 4 +--- compiler/arossupport/readstring.c | 3 +-- compiler/arossupport/readstruct.c | 3 +-- compiler/arossupport/rkprintf.c | 3 +-- compiler/arossupport/rt.c | 7 +------ compiler/arossupport/rt_dos.c | 4 +--- compiler/arossupport/rt_exec.c | 9 +-------- compiler/arossupport/writestruct.c | 3 +-- compiler/autoinit/__showerror.c | 4 +--- compiler/autoinit/commandline.c | 5 +---- compiler/clib/__open.c | 10 +--------- compiler/clib/__stdio.c | 3 --- compiler/clib/__stdio.h | 2 +- compiler/clib/close.c | 4 +--- compiler/clib/fclose.c | 3 +-- compiler/clib/fdopen.c | 4 +--- compiler/clib/fflush.c | 5 +---- compiler/clib/free.c | 4 +--- compiler/clib/fsync.c | 5 +---- compiler/clib/malloc.c | 7 +------ compiler/clib/mktemp.c | 3 +-- compiler/clib/realloc.c | 3 +-- compiler/clib/vfprintf.c | 4 +--- compiler/clib/write.c | 4 +--- compiler/coolimages/buttonclass.c | 5 +---- compiler/coolimages/imageclass.c | 5 +---- compiler/include/aros/cpu.h | 15 +-------------- rom/dos/lddemon.c | 3 +-- rom/exec/addhead.c | 3 +-- rom/exec/addtail.c | 3 +-- rom/exec/prepareexecbase.c | 8 +------- 75 files changed, 80 insertions(+), 252 deletions(-) diff --git a/arch/.unmaintained/arm-all/Drivers/irq.hidd.sa1100/servers.c b/arch/.unmaintained/arm-all/Drivers/irq.hidd.sa1100/servers.c index 35b56c5625..f8797684b6 100644 --- a/arch/.unmaintained/arm-all/Drivers/irq.hidd.sa1100/servers.c +++ b/arch/.unmaintained/arm-all/Drivers/irq.hidd.sa1100/servers.c @@ -1,5 +1,5 @@ /* - Copyright © 1995-2001, The AROS Development Team. All rights reserved. + Copyright © 1995-2007, The AROS Development Team. All rights reserved. $Id$ Desc: IRQ servers for SA1110 @@ -79,9 +79,6 @@ void timer_interrupt(HIDDT_IRQ_Handler *irq, HIDDT_IRQ_HwInfo *hw) { struct IntVector *iv = irq->h_Data; -#if 0 - AROS_GET_SYSBASE; -#endif if (iv->iv_Code) { /* Call it. I call with all these parameters for a reason. diff --git a/arch/.unmaintained/arm-all/exec/cause.c b/arch/.unmaintained/arm-all/exec/cause.c index 577e2ab601..c4023e6757 100644 --- a/arch/.unmaintained/arm-all/exec/cause.c +++ b/arch/.unmaintained/arm-all/exec/cause.c @@ -89,8 +89,6 @@ extern void RestoreRegs(struct Task *task, struct pt_regs *regs); { struct IntVector *iv; - AROS_GET_SYSBASE - #if 0 /* Hmm, interrupts are nesting, not a good idea... */ if(!user_mode(regs)) { diff --git a/arch/.unmaintained/arm-all/exec/core.c b/arch/.unmaintained/arm-all/exec/core.c index 4e11a4ec23..e86f776dd1 100644 --- a/arch/.unmaintained/arm-all/exec/core.c +++ b/arch/.unmaintained/arm-all/exec/core.c @@ -131,7 +131,6 @@ static void do_db_IRQ(unsigned int irq, unsigned int virq, struct pt_regs * regs) { - AROS_GET_SYSBASE struct irqServer * iServer; struct irqDescriptor * desc = &PLATFORMDATA(SysBase)->irq_desc[irq]; @@ -201,7 +200,6 @@ static void handle_IRQ_event(unsigned int virq, struct pt_regs * regs, struct ir */ void disable_irq_nosync(unsigned int irq) { - AROS_GET_SYSBASE if (!PLATFORMDATA(SysBase)->irq_desc[irq].id_depth++) { PLATFORMDATA(SysBase)->irq_desc[irq].id_status |= IRQ_DISABLED; PLATFORMDATA(SysBase)->irq_desc[irq].id_handler->ic_disable(irq); @@ -224,7 +222,6 @@ void enable_irq(unsigned int virq) { enable_db_irq(virq); #if 0 - AROS_GET_SYSBASE struct irqDescriptor * irq_desc = PLATFORMDATA(SysBase)->irq_desc; switch (irq_desc[irq].id_depth) { case 0: break; @@ -245,7 +242,6 @@ void enable_irq(unsigned int virq) */ void do_IRQ(struct pt_regs * regs, LONG adjust) { - AROS_GET_SYSBASE BOOL treated = FALSE; struct irqDescriptor * irq_desc = &PLATFORMDATA(SysBase)->irq_desc[1]; ULONG icip = RREG_L(ICIP); @@ -316,7 +312,6 @@ void do_IRQ(struct pt_regs * regs, LONG adjust) static void VBL_handler(int i, void *user, struct pt_regs *regs) { - AROS_GET_SYSBASE; if (SysBase->Elapsed == 0) { SysBase->SysFlags |= 0x2000; SysBase->AttnResched |= 0x80; diff --git a/arch/.unmaintained/arm-all/exec/idletask.c b/arch/.unmaintained/arm-all/exec/idletask.c index bca58c1a56..163eebd353 100644 --- a/arch/.unmaintained/arm-all/exec/idletask.c +++ b/arch/.unmaintained/arm-all/exec/idletask.c @@ -6,6 +6,8 @@ #include #include +#include + #define DEBUG 0 #include @@ -14,7 +16,6 @@ void idleTask(void) ULONG i = 0; while (1) { if (0 == (i % 5000000)) { - AROS_GET_SYSBASE D(bug("idle Task tick!\n")); } i ++; diff --git a/arch/.unmaintained/arm-all/exec/init.c b/arch/.unmaintained/arm-all/exec/init.c index 1df7a6f1cc..1cc8510d31 100644 --- a/arch/.unmaintained/arm-all/exec/init.c +++ b/arch/.unmaintained/arm-all/exec/init.c @@ -378,7 +378,6 @@ void main_init(void) */ static void main_init_cont(void) { - AROS_GET_SYSBASE D(bug("!!!!! in user mode now !!!!\n")); InitCode(RTF_SINGLETASK, 0); D(bug("Ooops, should never get here!\n")); diff --git a/arch/.unmaintained/arm-all/exec/setsr.c b/arch/.unmaintained/arm-all/exec/setsr.c index 365eee9f91..23045097f6 100644 --- a/arch/.unmaintained/arm-all/exec/setsr.c +++ b/arch/.unmaintained/arm-all/exec/setsr.c @@ -69,7 +69,6 @@ void _sys_SetSR(struct pt_regs * regs, LONG adjust) { -// AROS_GET_SYSBASE ULONG new = regs->r0; ULONG mask = regs->r1; regs->r0 = regs->cpsr; diff --git a/arch/.unmaintained/arm-all/exec/tools.c b/arch/.unmaintained/arm-all/exec/tools.c index 15f3bdc7de..455fe4d967 100644 --- a/arch/.unmaintained/arm-all/exec/tools.c +++ b/arch/.unmaintained/arm-all/exec/tools.c @@ -1,16 +1,17 @@ #include #include + +#include + #define DEBUG 1 #include void show_reg(ULONG reg) { - AROS_GET_SYSBASE D(bug("CONTENT: %x\n",reg)); } void show_r0(ULONG reg) { - AROS_GET_SYSBASE D(bug("CONTENT R0: %x\n",reg)); } diff --git a/arch/.unmaintained/m68k-pp-native/Drivers/irq.hidd/servers.c b/arch/.unmaintained/m68k-pp-native/Drivers/irq.hidd/servers.c index f7d9daa86b..efca5d41a2 100644 --- a/arch/.unmaintained/m68k-pp-native/Drivers/irq.hidd/servers.c +++ b/arch/.unmaintained/m68k-pp-native/Drivers/irq.hidd/servers.c @@ -89,9 +89,6 @@ void timer_interrupt(HIDDT_IRQ_Handler *irq, HIDDT_IRQ_HwInfo *hw) { struct IntVector *iv = irq->h_Data; -#if 0 - AROS_GET_SYSBASE; -#endif if (iv->iv_Code) { /* Call it. I call with all these parameters for a reason. diff --git a/arch/.unmaintained/m68k-pp-native/Drivers/serial.hidd/SerialUnitClass.c b/arch/.unmaintained/m68k-pp-native/Drivers/serial.hidd/SerialUnitClass.c index 5c4d48d456..3342f242fe 100755 --- a/arch/.unmaintained/m68k-pp-native/Drivers/serial.hidd/SerialUnitClass.c +++ b/arch/.unmaintained/m68k-pp-native/Drivers/serial.hidd/SerialUnitClass.c @@ -52,7 +52,6 @@ static inline void serial_out_w(struct HIDDSerialUnitData * data, ULONG offset, UWORD value) { - AROS_GET_SYSBASE D(bug("poke.w 0x%x,0x%x\n",data->baseaddr+offset,value)); WREG_W((data->baseaddr+offset)) = value; } @@ -60,7 +59,6 @@ static inline void serial_out_w(struct HIDDSerialUnitData * data, static inline UWORD serial_in_w(struct HIDDSerialUnitData * data, ULONG offset) { - AROS_GET_SYSBASE UWORD value = RREG_W((data->baseaddr+offset)); D(bug("peek.w 0x%x = 0x%x\n",data->baseaddr+offset,value)); return value; @@ -71,7 +69,6 @@ static inline void serial_out_b(struct HIDDSerialUnitData * data, ULONG offset, UBYTE value) { - AROS_GET_SYSBASE D(bug("poke.b 0x%x,0x%x\n",data->baseaddr+offset,value)); WREG_B((data->baseaddr+offset)) = value; } @@ -80,7 +77,6 @@ static inline void serial_out_b(struct HIDDSerialUnitData * data, static inline UBYTE serial_in_b(struct HIDDSerialUnitData * data, ULONG offset) { - AROS_GET_SYSBASE UBYTE value = RREG_B(data->baseaddr+offset); D(bug("peek.b 0x%x = 0x%x\n",data->baseaddr+offset,value)); return value; diff --git a/arch/.unmaintained/m68k-pp-native/exec/core.c b/arch/.unmaintained/m68k-pp-native/exec/core.c index 7fbf3a0a30..392e3e0253 100644 --- a/arch/.unmaintained/m68k-pp-native/exec/core.c +++ b/arch/.unmaintained/m68k-pp-native/exec/core.c @@ -128,7 +128,6 @@ static void do_db_IRQ(unsigned int irq, unsigned int virq, struct pt_regs * regs) { - AROS_GET_SYSBASE struct irqServer * iServer; struct irqDescriptor * desc = &PLATFORMDATA(SysBase)->irq_desc[irq]; @@ -188,7 +187,6 @@ static void handle_IRQ_event(unsigned int virq, struct pt_regs * regs, struct ir */ void disable_irq_nosync(unsigned int irq) { - AROS_GET_SYSBASE if (!PLATFORMDATA(SysBase)->irq_desc[irq].id_depth++) { PLATFORMDATA(SysBase)->irq_desc[irq].id_status |= IRQ_DISABLED; PLATFORMDATA(SysBase)->irq_desc[irq].id_handler->ic_disable(irq); @@ -211,7 +209,6 @@ void enable_irq(unsigned int virq) { enable_db_irq(virq); #if 0 - AROS_GET_SYSBASE struct irqDescriptor * irq_desc = PLATFORMDATA(SysBase)->irq_desc; switch (irq_desc[irq].id_depth) { case 0: break; @@ -233,7 +230,6 @@ extern void sys_Dispatch(struct pt_regs * regs); */ /*asmlinkage*/ void do_IRQ(struct pt_regs * regs, ULONG irq) { - AROS_GET_SYSBASE BOOL treated = FALSE; struct irqDescriptor * irq_desc = &PLATFORMDATA(SysBase)->irq_desc[irq]; ULONG isr = RREG_L(ISR); @@ -367,7 +363,6 @@ extern void sys_Dispatch(struct pt_regs * regs); static void VBL_handler(int i, void *user, struct pt_regs *regs) { - AROS_GET_SYSBASE; if (SysBase->Elapsed == 0) { SysBase->SysFlags |= 0x2000; SysBase->AttnResched |= 0x80; diff --git a/arch/.unmaintained/m68k-pp-native/exec/init.c b/arch/.unmaintained/m68k-pp-native/exec/init.c index 93b61d1f6a..404e772388 100644 --- a/arch/.unmaintained/m68k-pp-native/exec/init.c +++ b/arch/.unmaintained/m68k-pp-native/exec/init.c @@ -227,7 +227,6 @@ void main_init(void) */ void main_init_cont(void) { - AROS_GET_SYSBASE InitCode(RTF_SINGLETASK, 0); /* diff --git a/arch/.unmaintained/m68k-pp-native/exec/traps.c b/arch/.unmaintained/m68k-pp-native/exec/traps.c index cb84b44e5c..d10e677b2b 100644 --- a/arch/.unmaintained/m68k-pp-native/exec/traps.c +++ b/arch/.unmaintained/m68k-pp-native/exec/traps.c @@ -16,7 +16,6 @@ void do_TRAP(struct pt_regs regs) { - AROS_GET_SYSBASE ULONG alert = 0; #if 0 kprintf("*** trap: eip = %x eflags = %x ds = %x sp ~= %x\n", diff --git a/arch/i386-all/include/aros/i386/cpu.h b/arch/i386-all/include/aros/i386/cpu.h index f8f263f841..55dabbc1dd 100644 --- a/arch/i386-all/include/aros/i386/cpu.h +++ b/arch/i386-all/include/aros/i386/cpu.h @@ -1,7 +1,7 @@ -#ifndef AROS_MACHINE_H -#define AROS_MACHINE_H +#ifndef AROS_I386_CPU_H +#define AROS_I386_CPU_H /* - Copyright © 1995-2006, The AROS Development Team. All rights reserved. + Copyright © 1995-2007, The AROS Development Team. All rights reserved. $Id$ NOTE: This file must compile *without* any other header ! @@ -26,10 +26,6 @@ #define SIZEOF_FPU_STATE 108 /* 108 bytes are needed to store FPU */ #define SIZEOF_ALL_REGISTERS (15*4 + SIZEOF_FPU_STATE) /* Size of iet_Context */ -#define AROS_GET_SYSBASE extern struct ExecBase * SysBase; -#define AROS_GET_DOSBASE extern struct DosLibrary * DOSBase; -#define AROS_GET_SYSBASE_OK extern struct ExecBase * SysBase; - /* do we need a function attribute to get parameters on the stack? */ #define __stackparm @@ -207,4 +203,4 @@ extern void aros_not_implemented (); }) #define AROS_UFC3R(t,n,a1,a2,a3,p,ss) __UFC3R(t,n,a1,a2,a3,p) -#endif /* AROS_MACHINE_H */ +#endif /* AROS_I386_CPU_H */ diff --git a/arch/m68k-mac/exec/core.c b/arch/m68k-mac/exec/core.c index 7fbf3a0a30..8ce724e0cd 100644 --- a/arch/m68k-mac/exec/core.c +++ b/arch/m68k-mac/exec/core.c @@ -1,5 +1,5 @@ /* - Copyright © 1995-2001, The AROS Development Team. All rights reserved. + Copyright © 1995-2007, The AROS Development Team. All rights reserved. $Id$ Desc: Core of AROS. @@ -128,7 +128,6 @@ static void do_db_IRQ(unsigned int irq, unsigned int virq, struct pt_regs * regs) { - AROS_GET_SYSBASE struct irqServer * iServer; struct irqDescriptor * desc = &PLATFORMDATA(SysBase)->irq_desc[irq]; @@ -188,7 +187,6 @@ static void handle_IRQ_event(unsigned int virq, struct pt_regs * regs, struct ir */ void disable_irq_nosync(unsigned int irq) { - AROS_GET_SYSBASE if (!PLATFORMDATA(SysBase)->irq_desc[irq].id_depth++) { PLATFORMDATA(SysBase)->irq_desc[irq].id_status |= IRQ_DISABLED; PLATFORMDATA(SysBase)->irq_desc[irq].id_handler->ic_disable(irq); @@ -211,7 +209,6 @@ void enable_irq(unsigned int virq) { enable_db_irq(virq); #if 0 - AROS_GET_SYSBASE struct irqDescriptor * irq_desc = PLATFORMDATA(SysBase)->irq_desc; switch (irq_desc[irq].id_depth) { case 0: break; @@ -233,7 +230,6 @@ extern void sys_Dispatch(struct pt_regs * regs); */ /*asmlinkage*/ void do_IRQ(struct pt_regs * regs, ULONG irq) { - AROS_GET_SYSBASE BOOL treated = FALSE; struct irqDescriptor * irq_desc = &PLATFORMDATA(SysBase)->irq_desc[irq]; ULONG isr = RREG_L(ISR); @@ -367,7 +363,6 @@ extern void sys_Dispatch(struct pt_regs * regs); static void VBL_handler(int i, void *user, struct pt_regs *regs) { - AROS_GET_SYSBASE; if (SysBase->Elapsed == 0) { SysBase->SysFlags |= 0x2000; SysBase->AttnResched |= 0x80; diff --git a/arch/m68k-mac/exec/init.c b/arch/m68k-mac/exec/init.c index 9ed5d185c3..7c3b43a89e 100644 --- a/arch/m68k-mac/exec/init.c +++ b/arch/m68k-mac/exec/init.c @@ -1,5 +1,5 @@ /* - Copyright © 1995-2001, The AROS Development Team. All rights reserved. + Copyright © 1995-2007, The AROS Development Team. All rights reserved. $Id$ */ @@ -326,7 +326,6 @@ void get_initial_epinfo(void) */ void main_init_cont(void) { - AROS_GET_SYSBASE InitCode(RTF_SINGLETASK, 0); /* diff --git a/arch/m68k-mac/exec/traps.c b/arch/m68k-mac/exec/traps.c index cb84b44e5c..21fc01d3d6 100644 --- a/arch/m68k-mac/exec/traps.c +++ b/arch/m68k-mac/exec/traps.c @@ -1,5 +1,5 @@ /* - Copyright © 1995-2001, The AROS Development Team. All rights reserved. + Copyright © 1995-2007, The AROS Development Team. All rights reserved. $Id$ */ @@ -16,7 +16,6 @@ void do_TRAP(struct pt_regs regs) { - AROS_GET_SYSBASE ULONG alert = 0; #if 0 kprintf("*** trap: eip = %x eflags = %x ds = %x sp ~= %x\n", diff --git a/arch/m68k-mac/include/aros/m68k/cpu.h b/arch/m68k-mac/include/aros/m68k/cpu.h index dbb19b7a6e..4bda12277b 100644 --- a/arch/m68k-mac/include/aros/m68k/cpu.h +++ b/arch/m68k-mac/include/aros/m68k/cpu.h @@ -1,8 +1,8 @@ -#ifndef AROS_MACHINE_H -#define AROS_MACHINE_H +#ifndef AROS_M68K_CPU_H +#define AROS_M68K_CPU_H /* - Copyright © 1995-2001, The AROS Development Team. All rights reserved. + Copyright © 1995-2007, The AROS Development Team. All rights reserved. $Id$ NOTE: This file must compile *without* any other header ! @@ -24,12 +24,6 @@ #define AROS_DOUBLEALIGN 4 /* Alignment for double */ #define AROS_WORSTALIGN 8 /* Worst case alignment */ -#define AROS_GET_SYSBASE struct ExecBase * SysBase = *(struct ExecBase **)0x4; -#define AROS_GET_SYSBASE_OK struct ExecBase * SysBase = *(struct ExecBase **)0x4; -/*#define AROS_GET_DOSBASE struct DosLibrary * DOSBase = (struct DosLibrary *)OpenLibrary((UBYTE *)"dos.library",0); \*/ -// CloseLibrary(DOSBase); -#define AROS_GET_DOSBASE extern struct DosLibrary *DOSBase; - #define AROS_NOFPU 1 /* do we need a function attribute to get parameters on the stack? */ @@ -215,4 +209,4 @@ extern void aros_not_implemented (); }) #define AROS_UFC3R(t,n,a1,a2,a3,p,ss) __UFC3R(t,n,a1,a2,a3,p) -#endif /* AROS_MACHINE_H */ +#endif /* AROS_M68K_CPU_H */ diff --git a/arch/ppc-all/include/aros/ppc/cpu.h b/arch/ppc-all/include/aros/ppc/cpu.h index 25dd27636d..77530aa1b8 100644 --- a/arch/ppc-all/include/aros/ppc/cpu.h +++ b/arch/ppc-all/include/aros/ppc/cpu.h @@ -1,7 +1,7 @@ -#ifndef AROS_MACHINE_H -#define AROS_MACHINE_H +#ifndef AROS_PPC_CPU_H +#define AROS_PPC_CPU_H /* - Copyright © 1995-2006, The AROS Development Team. All rights reserved. + Copyright © 1995-2007, The AROS Development Team. All rights reserved. $Id$ NOTE: This file must compile *without* any other header ! @@ -20,10 +20,6 @@ #define AROS_DOUBLEALIGN 4 /* Alignment for double */ #define AROS_WORSTALIGN 8 /* Worst case alignment */ -#define AROS_GET_SYSBASE extern struct ExecBase *SysBase; -#define AROS_GET_DOSBASE extern struct DosLibrary *DOSBase; -#define AROS_GET_SYSBASE_OK extern struct ExecBase *SysBase; - /* do we need a function attribute to get parameters on the stack? */ #define __stackparm __attribute__((stackparm)) @@ -234,4 +230,4 @@ extern void _aros_not_implemented (char *); (_t)_re;\ }) #define AROS_UFC3R(t,n,a1,a2,a3,p,ss) __UFC3R(t,n,a1,a2,a3,p) -#endif /* AROS_MACHINE_H */ +#endif /* AROS_PPC_CPU_H */ diff --git a/arch/x86_64-all/include/aros/x86_64/cpu.h b/arch/x86_64-all/include/aros/x86_64/cpu.h index 275fce9a8f..1149ae87c8 100644 --- a/arch/x86_64-all/include/aros/x86_64/cpu.h +++ b/arch/x86_64-all/include/aros/x86_64/cpu.h @@ -1,7 +1,7 @@ -#ifndef AROS_MACHINE_H -#define AROS_MACHINE_H +#ifndef AROS_X86_64_CPU_H +#define AROS_X86_64_CPU_H /* - Copyright © 1995-2006, The AROS Development Team. All rights reserved. + Copyright © 1995-2007, The AROS Development Team. All rights reserved. $Id: machine.h 22676 2005-01-09 23:01:16Z falemagn $ NOTE: This file must compile *without* any other header ! @@ -21,10 +21,6 @@ #define AROS_DOUBLEALIGN 8 /* Alignment for double */ #define AROS_WORSTALIGN 8 /* Worst case alignment */ -#define AROS_GET_SYSBASE extern struct ExecBase *SysBase; -#define AROS_GET_DOSBASE extern struct DosLibrary *DOSBase; -#define AROS_GET_SYSBASE_OK extern struct ExecBase *SysBase; - #ifndef __TINYC__ register unsigned char * AROS_GET_SP asm("%rsp"); #endif @@ -194,4 +190,4 @@ extern void _aros_not_implemented (char *); }) #define AROS_UFC3R(t,n,a1,a2,a3,p,ss) __UFC3R(t,n,a1,a2,a3,p) -#endif /* AROS_MACHINE_H */ +#endif /* AROS_X86_64_CPU_H */ diff --git a/compiler/alib/checkrexxmsg.c b/compiler/alib/checkrexxmsg.c index d8483107fe..35e873f62d 100644 --- a/compiler/alib/checkrexxmsg.c +++ b/compiler/alib/checkrexxmsg.c @@ -1,5 +1,5 @@ /* - Copyright © 1995-2002, The AROS Development Team. All rights reserved. + Copyright © 1995-2007, The AROS Development Team. All rights reserved. $Id$ Desc: @@ -45,7 +45,6 @@ *****************************************************************************/ { - AROS_GET_SYSBASE_OK struct Library *RexxSysBase = NULL; struct RexxMsg *msg2 = NULL, *msg3; struct MsgPort *port = NULL, *rexxport; diff --git a/compiler/alib/createextio.c b/compiler/alib/createextio.c index b9e4c3c50f..9c95da3a58 100644 --- a/compiler/alib/createextio.c +++ b/compiler/alib/createextio.c @@ -1,5 +1,5 @@ /* - Copyright © 1995-2001, The AROS Development Team. All rights reserved. + Copyright © 1995-2007, The AROS Development Team. All rights reserved. $Id$ Desc: @@ -47,7 +47,6 @@ ******************************************************************************/ { - AROS_GET_SYSBASE_OK struct IORequest *ioreq=NULL; if (port && (ioreq = AllocMem (iosize, MEMF_CLEAR|MEMF_PUBLIC))) diff --git a/compiler/alib/createport.c b/compiler/alib/createport.c index 4314e76fae..48e0eb4803 100644 --- a/compiler/alib/createport.c +++ b/compiler/alib/createport.c @@ -1,5 +1,5 @@ /* - Copyright © 1995-2001, The AROS Development Team. All rights reserved. + Copyright © 1995-2007, The AROS Development Team. All rights reserved. $Id$ Desc: amiga.lib function CreatePort() @@ -47,7 +47,6 @@ ******************************************************************************/ { - AROS_GET_SYSBASE_OK struct MsgPort * mp; mp = CreateMsgPort (); diff --git a/compiler/alib/createtask.c b/compiler/alib/createtask.c index 28218a7ecd..f320ee06bb 100644 --- a/compiler/alib/createtask.c +++ b/compiler/alib/createtask.c @@ -1,5 +1,5 @@ /* - Copyright © 1995-2001, The AROS Development Team. All rights reserved. + Copyright © 1995-2007, The AROS Development Team. All rights reserved. $Id$ Desc: Create a new Amiga task @@ -74,7 +74,6 @@ static const struct newMemList MemTemplate = ******************************************************************************/ { - AROS_GET_SYSBASE_OK struct Task * newtask, * task2; struct newMemList nml; diff --git a/compiler/alib/deleteextio.c b/compiler/alib/deleteextio.c index e90f231d2e..3272e697d1 100644 --- a/compiler/alib/deleteextio.c +++ b/compiler/alib/deleteextio.c @@ -1,5 +1,5 @@ /* - Copyright © 1995-2001, The AROS Development Team. All rights reserved. + Copyright © 1995-2007, The AROS Development Team. All rights reserved. $Id$ Desc: Free a structure created by CreateExtIO() @@ -44,7 +44,6 @@ ******************************************************************************/ { - AROS_GET_SYSBASE_OK /* Erase some fields to enforce crashes */ ioreq->io_Message.mn_Node.ln_Type = -1L; diff --git a/compiler/alib/deleteport.c b/compiler/alib/deleteport.c index 43609263ce..3255687293 100644 --- a/compiler/alib/deleteport.c +++ b/compiler/alib/deleteport.c @@ -1,5 +1,5 @@ /* - Copyright © 1995-2001, The AROS Development Team. All rights reserved. + Copyright © 1995-2007, The AROS Development Team. All rights reserved. $Id$ Desc: amiga.lib function DeletePort() @@ -42,7 +42,6 @@ ******************************************************************************/ { - AROS_GET_SYSBASE_OK if (mp->mp_Node.ln_Name) RemPort (mp); diff --git a/compiler/alib/deletestdio.c b/compiler/alib/deletestdio.c index cfb2937a1c..8aba61179a 100644 --- a/compiler/alib/deletestdio.c +++ b/compiler/alib/deletestdio.c @@ -1,5 +1,5 @@ /* - Copyright © 1995-2001, The AROS Development Team. All rights reserved. + Copyright © 1995-2007, The AROS Development Team. All rights reserved. $Id$ Desc: amiga.lib function DeleteStdIo() @@ -45,8 +45,6 @@ ******************************************************************************/ { # define ioreq ((struct IORequest *)io) - AROS_GET_SYSBASE_OK - /* Write illegal values to some fields to enforce crashes */ ioreq->io_Message.mn_Node.ln_Type = -1L; diff --git a/compiler/alib/deletetask.c b/compiler/alib/deletetask.c index 841d250537..fc26bed398 100644 --- a/compiler/alib/deletetask.c +++ b/compiler/alib/deletetask.c @@ -1,5 +1,5 @@ /* - Copyright © 1995-2001, The AROS Development Team. All rights reserved. + Copyright © 1995-2007, The AROS Development Team. All rights reserved. $Id$ */ @@ -41,7 +41,6 @@ ******************************************************************************/ { - AROS_GET_SYSBASE_OK RemTask (task); } /* DeleteTask */ diff --git a/compiler/alib/domethod.c b/compiler/alib/domethod.c index e5cbf073a9..ac4654606e 100644 --- a/compiler/alib/domethod.c +++ b/compiler/alib/domethod.c @@ -1,5 +1,5 @@ /* - Copyright © 1995-2003, The AROS Development Team. All rights reserved. + Copyright © 1995-2007, The AROS Development Team. All rights reserved. $Id$ */ @@ -50,8 +50,6 @@ ******************************************************************************/ { - AROS_GET_SYSBASE_OK - ASSERT_VALID_PTR(obj); if (!obj) return 0L; @@ -64,8 +62,6 @@ IPTR DoMethod (Object * obj, ULONG MethodID, ...) { - AROS_GET_SYSBASE_OK - ASSERT_VALID_PTR(obj); if (!obj) return 0L; diff --git a/compiler/alib/freeievents.c b/compiler/alib/freeievents.c index a7e5030ccc..e63d0a25cf 100644 --- a/compiler/alib/freeievents.c +++ b/compiler/alib/freeievents.c @@ -1,5 +1,5 @@ /* - Copyright © 1995-2001, The AROS Development Team. All rights reserved. + Copyright © 1995-2007, The AROS Development Team. All rights reserved. $Id$ */ @@ -43,7 +43,6 @@ ******************************************************************************/ { - AROS_GET_SYSBASE_OK struct InputEvent *next; for(next = ie; next != NULL; ie = next) diff --git a/compiler/alib/getrexxvar.c b/compiler/alib/getrexxvar.c index 873a02d0df..d667aa96bb 100644 --- a/compiler/alib/getrexxvar.c +++ b/compiler/alib/getrexxvar.c @@ -1,5 +1,5 @@ /* - Copyright © 1995-2002, The AROS Development Team. All rights reserved. + Copyright © 1995-2007, The AROS Development Team. All rights reserved. $Id$ Desc: @@ -56,7 +56,6 @@ *****************************************************************************/ { - AROS_GET_SYSBASE_OK struct Library *RexxSysBase = NULL; struct RexxMsg *msg2 = NULL, *msg3; struct MsgPort *port = NULL, *rexxport; diff --git a/compiler/alib/invertstring.c b/compiler/alib/invertstring.c index c10510737e..16d54713ac 100644 --- a/compiler/alib/invertstring.c +++ b/compiler/alib/invertstring.c @@ -1,5 +1,5 @@ /* - Copyright © 1995-2001, The AROS Development Team. All rights reserved. + Copyright © 1995-2007, The AROS Development Team. All rights reserved. $Id$ */ @@ -62,8 +62,6 @@ extern struct Library *CxBase; ******************************************************************************/ { - AROS_GET_SYSBASE_OK - struct InputEvent *ieChain = NULL; struct InputEvent *ie; struct InputEvent *first = NULL; diff --git a/compiler/alib/liballocpooled.c b/compiler/alib/liballocpooled.c index c92630f7ed..a343d2b463 100644 --- a/compiler/alib/liballocpooled.c +++ b/compiler/alib/liballocpooled.c @@ -1,5 +1,5 @@ /* - Copyright © 1995-2001, The AROS Development Team. All rights reserved. + Copyright © 1995-2007, The AROS Development Team. All rights reserved. Original version from libnix $Id$ */ @@ -40,7 +40,6 @@ ******************************************************************************/ { # define poolHeader ((POOL *)pool) - AROS_GET_SYSBASE_OK ULONG *puddle = NULL; if (SysBase->LibNode.lib_Version >= 39) diff --git a/compiler/alib/libcreatepool.c b/compiler/alib/libcreatepool.c index 706f0164eb..e1160b1aae 100644 --- a/compiler/alib/libcreatepool.c +++ b/compiler/alib/libcreatepool.c @@ -1,5 +1,5 @@ /* - Copyright © 1995-2001, The AROS Development Team. All rights reserved. + Copyright © 1995-2007, The AROS Development Team. All rights reserved. Original version from libnix $Id$ */ @@ -39,7 +39,6 @@ ******************************************************************************/ { - AROS_GET_SYSBASE_OK if (SysBase->LibNode.lib_Version >= 39) return (CreatePool (requirements, puddleSize, threshSize)); diff --git a/compiler/alib/libdeletepool.c b/compiler/alib/libdeletepool.c index ba01cb8835..a039ce7a08 100644 --- a/compiler/alib/libdeletepool.c +++ b/compiler/alib/libdeletepool.c @@ -1,5 +1,5 @@ /* - Copyright © 1995-2001, The AROS Development Team. All rights reserved. + Copyright © 1995-2007, The AROS Development Team. All rights reserved. Original version from libnix $Id$ */ @@ -38,8 +38,6 @@ ******************************************************************************/ { # define poolHeader ((POOL*)pool) - AROS_GET_SYSBASE_OK - if (SysBase->LibNode.lib_Version>=39) DeletePool(poolHeader); else diff --git a/compiler/alib/libfreepooled.c b/compiler/alib/libfreepooled.c index c23fc623dc..4aa5c0c725 100644 --- a/compiler/alib/libfreepooled.c +++ b/compiler/alib/libfreepooled.c @@ -1,5 +1,5 @@ /* - Copyright © 1995-2001, The AROS Development Team. All rights reserved. + Copyright © 1995-2007, The AROS Development Team. All rights reserved. Original version from libnix $Id$ */ @@ -41,8 +41,6 @@ ******************************************************************************/ { # define poolHeader ((POOL *)pool) - AROS_GET_SYSBASE_OK - if (SysBase->LibNode.lib_Version >= 39) { FreePooled (poolHeader, memory, memSize); diff --git a/compiler/alib/setrexxvar.c b/compiler/alib/setrexxvar.c index 47d70bf725..9368f1e268 100644 --- a/compiler/alib/setrexxvar.c +++ b/compiler/alib/setrexxvar.c @@ -1,5 +1,5 @@ /* - Copyright © 1995-2002, The AROS Development Team. All rights reserved. + Copyright © 1995-2007, The AROS Development Team. All rights reserved. $Id$ Desc: @@ -52,7 +52,6 @@ *****************************************************************************/ { - AROS_GET_SYSBASE_OK struct Library *RexxSysBase = NULL; struct RexxMsg *msg2 = NULL, *msg3; struct MsgPort *port = NULL, *rexxport; diff --git a/compiler/alib/sprintf.c b/compiler/alib/sprintf.c index 37cac1915e..4ca64e3803 100644 --- a/compiler/alib/sprintf.c +++ b/compiler/alib/sprintf.c @@ -1,5 +1,5 @@ /* - Copyright © 1995-2001, The AROS Development Team. All rights reserved. + Copyright © 1995-2007, The AROS Development Team. All rights reserved. $Id$ */ @@ -56,6 +56,5 @@ AROS_UFH2(void, __putChr, *****************************************************************************/ { - AROS_GET_SYSBASE_OK RawDoFmt(format, &format+1, (VOID_FUNC)__putChr, &buffer); } /* sprintf */ diff --git a/compiler/alib/timedelay.c b/compiler/alib/timedelay.c index 464f9efca8..c0a85132d2 100644 --- a/compiler/alib/timedelay.c +++ b/compiler/alib/timedelay.c @@ -1,5 +1,5 @@ /* - Copyright © 1995-2001, The AROS Development Team. All rights reserved. + Copyright © 1995-2007, The AROS Development Team. All rights reserved. $Id$ Desc: TimeDelay() - wait a specified time. @@ -57,7 +57,6 @@ ******************************************************************************/ { AROS_USERFUNC_INIT - AROS_GET_SYSBASE_OK struct timerequest tr; struct MsgPort mp; diff --git a/compiler/arossupport/_kprintf.c b/compiler/arossupport/_kprintf.c index 20c3545b54..0be6c4a76d 100644 --- a/compiler/arossupport/_kprintf.c +++ b/compiler/arossupport/_kprintf.c @@ -1,5 +1,5 @@ /* - Copyright © 1995-2001, The AROS Development Team. All rights reserved. + Copyright © 1995-2007, The AROS Development Team. All rights reserved. $Id$ Desc: Low-level debugging support. @@ -27,7 +27,5 @@ void KPrintF(STRPTR format, ...) __stackparm; void KPrintF(STRPTR format, ...) { - AROS_GET_SYSBASE_OK - RawDoFmt(format,&format+1,(VOID_FUNC)KPutChar,SysBase); } diff --git a/compiler/arossupport/debugmem.c b/compiler/arossupport/debugmem.c index 5053a19f71..2eb5887da1 100644 --- a/compiler/arossupport/debugmem.c +++ b/compiler/arossupport/debugmem.c @@ -1,5 +1,5 @@ /* - Copyright © 1995-2003, The AROS Development Team. All rights reserved. + Copyright © 1995-2007, The AROS Development Team. All rights reserved. $Id$ Show a dump of the memory list. @@ -46,7 +46,6 @@ ******************************************************************************/ { #ifndef __DONT_USE_DEBUGMEM__ - AROS_GET_SYSBASE_OK struct MemHeader *mh; struct MemChunk *mc; diff --git a/compiler/arossupport/freestruct.c b/compiler/arossupport/freestruct.c index 06d9d0521e..76de414f47 100644 --- a/compiler/arossupport/freestruct.c +++ b/compiler/arossupport/freestruct.c @@ -1,5 +1,5 @@ /* - Copyright © 1995-2001, The AROS Development Team. All rights reserved. + Copyright © 1995-2007, The AROS Development Team. All rights reserved. $Id$ Desc: Free a structure returned by ReadStruct() @@ -64,7 +64,6 @@ struct FreeLevel ******************************************************************************/ { - AROS_GET_SYSBASE_OK struct MinList _list; struct FreeLevel * curr; diff --git a/compiler/arossupport/hexdump.c b/compiler/arossupport/hexdump.c index 1663e7fba7..deeb51619a 100644 --- a/compiler/arossupport/hexdump.c +++ b/compiler/arossupport/hexdump.c @@ -1,5 +1,5 @@ /* - Copyright © 1995-2001, The AROS Development Team. All rights reserved. + Copyright © 1995-2007, The AROS Development Team. All rights reserved. $Id$ Desc: Prints a hexdump of a memory region @@ -57,7 +57,6 @@ ******************************************************************************/ { - AROS_GET_SYSBASE_OK ULONG t, end; int i; diff --git a/compiler/arossupport/kprintf.c b/compiler/arossupport/kprintf.c index 7506d8ba83..595229a7c2 100644 --- a/compiler/arossupport/kprintf.c +++ b/compiler/arossupport/kprintf.c @@ -1,5 +1,5 @@ /* - Copyright © 1995-2001, The AROS Development Team. All rights reserved. + Copyright © 1995-2007, The AROS Development Team. All rights reserved. $Id$ Desc: Formats a message and makes sure the user will see it. @@ -78,7 +78,6 @@ int vkprintf (const UBYTE * fmt, va_list args) { - AROS_GET_SYSBASE_OK int ret; static const char uhex[] = "0123456789ABCDEF"; static const char lhex[] = "0123456789abcdef"; diff --git a/compiler/arossupport/purify.c b/compiler/arossupport/purify.c index c256eea651..823e8dcde0 100644 --- a/compiler/arossupport/purify.c +++ b/compiler/arossupport/purify.c @@ -1,5 +1,5 @@ /* - Copyright © 1995-2001, The AROS Development Team. All rights reserved. + Copyright © 1995-2007, The AROS Development Team. All rights reserved. $Id$ Desc: Support files for purify (incomplete) @@ -114,7 +114,6 @@ extern void RT_ShowRTStack (void); ******************************************************************************/ { - AROS_GET_SYSBASE_OK struct PNode * node; if (!InitWasCalled) @@ -177,7 +176,6 @@ extern void RT_ShowRTStack (void); ******************************************************************************/ { - AROS_GET_SYSBASE_OK struct PNode * node, * nodeBefore, * nodeAfter; UBYTE * mem; @@ -264,7 +262,6 @@ extern void RT_ShowRTStack (void); ******************************************************************************/ { - AROS_GET_SYSBASE_OK struct PNode * node; UBYTE * mem; diff --git a/compiler/arossupport/rawputchars.c b/compiler/arossupport/rawputchars.c index 9d6135e20d..c97e81ba48 100644 --- a/compiler/arossupport/rawputchars.c +++ b/compiler/arossupport/rawputchars.c @@ -1,5 +1,5 @@ /* - Copyright © 1995-2001, The AROS Development Team. All rights reserved. + Copyright © 1995-2007, The AROS Development Team. All rights reserved. $Id$ Desc: Formats a message and makes sure the user will see it. @@ -44,8 +44,6 @@ ******************************************************************************/ { - AROS_GET_SYSBASE_OK - while (*str && len --) RawPutChar (*str ++); } /* RawPutChars */ diff --git a/compiler/arossupport/readstring.c b/compiler/arossupport/readstring.c index 3e48c74e70..3c3a0835bf 100644 --- a/compiler/arossupport/readstring.c +++ b/compiler/arossupport/readstring.c @@ -1,5 +1,5 @@ /* - Copyright © 1995-2001, The AROS Development Team. All rights reserved. + Copyright © 1995-2007, The AROS Development Team. All rights reserved. $Id$ Desc: Read one C string from a streamhook @@ -58,7 +58,6 @@ ******************************************************************************/ { - AROS_GET_SYSBASE_OK STRPTR buffer; LONG size, maxsize; LONG c; diff --git a/compiler/arossupport/readstruct.c b/compiler/arossupport/readstruct.c index 781eca6c8d..e2e1e52e28 100644 --- a/compiler/arossupport/readstruct.c +++ b/compiler/arossupport/readstruct.c @@ -1,5 +1,5 @@ /* - Copyright © 1995-2001, The AROS Development Team. All rights reserved. + Copyright © 1995-2007, The AROS Development Team. All rights reserved. $Id$ Desc: Read a big endian structure from a streamhook @@ -69,7 +69,6 @@ struct ReadLevel ******************************************************************************/ { - AROS_GET_SYSBASE_OK struct MinList _list; struct ReadLevel * curr; diff --git a/compiler/arossupport/rkprintf.c b/compiler/arossupport/rkprintf.c index 76611e68e8..62febcda3f 100644 --- a/compiler/arossupport/rkprintf.c +++ b/compiler/arossupport/rkprintf.c @@ -1,5 +1,5 @@ /* - Copyright © 1995-2001, The AROS Development Team. All rights reserved. + Copyright © 1995-2007, The AROS Development Team. All rights reserved. $Id$ Desc: Formats a message and makes sure the user will see it. @@ -86,7 +86,6 @@ { va_list ap; int ret; - //AROS_GET_SYSBASE_OK #warning FIXME check the systems and the debug level // Check SysBase->DebugAROSBase->DebugConfig diff --git a/compiler/arossupport/rt.c b/compiler/arossupport/rt.c index 851ffe40f3..b82bbdda38 100644 --- a/compiler/arossupport/rt.c +++ b/compiler/arossupport/rt.c @@ -1,5 +1,5 @@ /* - Copyright © 1995-2001, The AROS Development Team. All rights reserved. + Copyright © 1995-2007, The AROS Development Team. All rights reserved. $Id$ Desc: Basic functions for ressource tracking @@ -69,7 +69,6 @@ RTDesc const * RT_Resources[RTT_MAX]; ******************************************************************************/ { - AROS_GET_SYSBASE_OK RTData * rtd; if ((rtd = GetRTData ())) @@ -239,7 +238,6 @@ RTDesc const * RT_Resources[RTT_MAX]; ******************************************************************************/ { - AROS_GET_SYSBASE_OK RTData * rtd; if (!(rtd = GetRTData ()) ) @@ -296,7 +294,6 @@ RTDesc const * RT_Resources[RTT_MAX]; ******************************************************************************/ { - AROS_GET_SYSBASE_OK RTData * rtd; IPTR ret; va_list args; @@ -388,7 +385,6 @@ RTDesc const * RT_Resources[RTT_MAX]; ******************************************************************************/ { - AROS_GET_SYSBASE_OK RTData * rtd; va_list args; Resource * rtnew; @@ -855,7 +851,6 @@ RTDesc const * RT_Resources[RTT_MAX]; ******************************************************************************/ { - AROS_GET_SYSBASE_OK if (!rtd && !(rtd = GetRTData ())) return; diff --git a/compiler/arossupport/rt_dos.c b/compiler/arossupport/rt_dos.c index 2aa38fea18..bd307df4f9 100644 --- a/compiler/arossupport/rt_dos.c +++ b/compiler/arossupport/rt_dos.c @@ -1,5 +1,5 @@ /* - Copyright © 1995-2001, The AROS Development Team. All rights reserved. + Copyright © 1995-2007, The AROS Development Team. All rights reserved. $Id$ Desc: Basic functions for ressource tracking @@ -69,7 +69,6 @@ void RT_ExitDos (void) static IPTR RT_Open (RTData * rtd, FileResource * rt, va_list args, BOOL * success) { - AROS_GET_SYSBASE_OK STRPTR path; path = va_arg (args, STRPTR); @@ -125,7 +124,6 @@ static IPTR RT_Open (RTData * rtd, FileResource * rt, va_list args, BOOL * succe static IPTR RT_Close (RTData * rtd, FileResource * rt) { - AROS_GET_SYSBASE_OK Close (rt->FH); FreeVec (rt->Path); diff --git a/compiler/arossupport/rt_exec.c b/compiler/arossupport/rt_exec.c index ca0b9038de..69cdac1b29 100644 --- a/compiler/arossupport/rt_exec.c +++ b/compiler/arossupport/rt_exec.c @@ -1,5 +1,5 @@ /* - Copyright © 1995-2001, The AROS Development Team. All rights reserved. + Copyright © 1995-2007, The AROS Development Team. All rights reserved. $Id$ Desc: Basic functions for ressource tracking @@ -125,7 +125,6 @@ void RT_ExitExec (void) static IPTR RT_AllocMem (RTData * rtd, MemoryResource * rt, va_list args, BOOL * success) { - AROS_GET_SYSBASE_OK rt->Size = va_arg (args, ULONG); rt->Flags = va_arg (args, ULONG); @@ -139,7 +138,6 @@ static IPTR RT_AllocMem (RTData * rtd, MemoryResource * rt, va_list args, BOOL * static IPTR RT_FreeMem (RTData * rtd, MemoryResource * rt) { - AROS_GET_SYSBASE_OK FreeMem (rt->Memory, rt->Size); return TRUE; @@ -243,7 +241,6 @@ static IPTR RT_ShowErrorMem (RTData * rtd, int rtt, MemoryResource * rt, static IPTR RT_AllocVec (RTData * rtd, MemoryResource * rt, va_list args, BOOL * success) { - AROS_GET_SYSBASE_OK rt->Size = va_arg (args, ULONG); rt->Flags = va_arg (args, ULONG); @@ -257,7 +254,6 @@ static IPTR RT_AllocVec (RTData * rtd, MemoryResource * rt, va_list args, BOOL * static IPTR RT_FreeVec (RTData * rtd, MemoryResource * rt) { - AROS_GET_SYSBASE_OK if (rt) FreeVec (rt->Memory); @@ -355,7 +351,6 @@ static IPTR RT_ShowErrorVec (RTData * rtd, int rtt, MemoryResource * rt, static IPTR RT_CreatePort (RTData * rtd, PortResource * rt, va_list args, BOOL * success) { - AROS_GET_SYSBASE_OK STRPTR name; LONG pri; @@ -527,7 +522,6 @@ static IPTR RT_CheckPort (RTData * rtd, int rtt, static IPTR RT_OpenLibrary (RTData * rtd, LibraryResource * rt, va_list args, BOOL * success) { - AROS_GET_SYSBASE_OK rt->Name = va_arg (args, STRPTR); rt->Version = va_arg (args, ULONG); @@ -541,7 +535,6 @@ static IPTR RT_OpenLibrary (RTData * rtd, LibraryResource * rt, va_list args, BO static IPTR RT_CloseLibrary (RTData * rtd, LibraryResource * rt) { - AROS_GET_SYSBASE_OK CloseLibrary (rt->Lib); return TRUE; diff --git a/compiler/arossupport/writestruct.c b/compiler/arossupport/writestruct.c index dfdf7aa828..5ef33ba4cf 100644 --- a/compiler/arossupport/writestruct.c +++ b/compiler/arossupport/writestruct.c @@ -1,5 +1,5 @@ /* - Copyright © 1995-2001, The AROS Development Team. All rights reserved. + Copyright © 1995-2007, The AROS Development Team. All rights reserved. $Id$ Desc: Write a big endian structure to a streamhook @@ -77,7 +77,6 @@ struct WriteLevel ******************************************************************************/ { - AROS_GET_SYSBASE_OK struct MinList _list; struct WriteLevel * curr; diff --git a/compiler/autoinit/__showerror.c b/compiler/autoinit/__showerror.c index 96d43f005b..0d998dba5d 100644 --- a/compiler/autoinit/__showerror.c +++ b/compiler/autoinit/__showerror.c @@ -1,5 +1,5 @@ /* - Copyright © 1995-2001, The AROS Development Team. All rights reserved. + Copyright © 1995-2007, The AROS Development Team. All rights reserved. $Id$ Desc: autoinit library - support function for showing errors to the user @@ -17,8 +17,6 @@ int __forceerrorrequester __attribute__((weak)) = 0; void __showerror(char *format, const IPTR *args) { - AROS_GET_SYSBASE_OK - struct IntuitionBase *IntuitionBase; struct DosLibrary *DOSBase = NULL; const char *name = FindTask(NULL)->tc_Node.ln_Name; diff --git a/compiler/autoinit/commandline.c b/compiler/autoinit/commandline.c index 60f56d11d4..d23b713a2d 100644 --- a/compiler/autoinit/commandline.c +++ b/compiler/autoinit/commandline.c @@ -1,5 +1,5 @@ /* - Copyright © 1995-2001, The AROS Development Team. All rights reserved. + Copyright © 1995-2007, The AROS Development Team. All rights reserved. $Id$ */ @@ -25,7 +25,6 @@ static int __argmax; int __initcommandline(void) { - AROS_GET_SYSBASE_OK char *ptr = NULL; if (WBenchMsg) @@ -144,8 +143,6 @@ int __initcommandline(void) void __exitcommandline(void) { - AROS_GET_SYSBASE_OK - if (WBenchMsg != NULL) return; diff --git a/compiler/clib/__open.c b/compiler/clib/__open.c index a2445fe082..402cbd88a3 100644 --- a/compiler/clib/__open.c +++ b/compiler/clib/__open.c @@ -1,5 +1,5 @@ /* - Copyright © 1995-2004, The AROS Development Team. All rights reserved. + Copyright © 1995-2007, The AROS Development Team. All rights reserved. $Id$ File descriptors handling internals. @@ -53,8 +53,6 @@ int __getfirstfd(register int startfd) int __getfdslot(int wanted_fd) { - AROS_GET_SYSBASE_OK - if (wanted_fd>=__numslots) { void *tmp; @@ -116,8 +114,6 @@ int __open(int wanted_fd, const char *pathname, int flags, int mode) fdesc *currdesc = NULL; struct FileInfoBlock *fib = NULL; LONG openmode = __oflags2amode(flags); - AROS_GET_SYSBASE_OK - AROS_GET_DOSBASE if (__doupath && pathname[0] == '\0') { @@ -246,8 +242,6 @@ int __init_stdfiles(void) struct Process *me; fdesc *indesc=NULL, *outdesc=NULL, *errdesc=NULL; int res = __getfdslot(2); - AROS_GET_SYSBASE_OK - AROS_GET_DOSBASE if ( @@ -294,8 +288,6 @@ void __exit_stdfiles(void) void __updatestdio(void) { struct Process *me; - AROS_GET_SYSBASE_OK - AROS_GET_DOSBASE me = (struct Process *)FindTask(NULL); diff --git a/compiler/clib/__stdio.c b/compiler/clib/__stdio.c index 1d85e517d4..ad3e3ea251 100644 --- a/compiler/clib/__stdio.c +++ b/compiler/clib/__stdio.c @@ -104,9 +104,6 @@ int __oflags2sflags(int omode) int __init_stdio(void) { - AROS_GET_SYSBASE_OK - AROS_GET_DOSBASE - NEWLIST(&__stdio_files); if diff --git a/compiler/clib/__stdio.h b/compiler/clib/__stdio.h index fc07742a75..d76f7386fe 100644 --- a/compiler/clib/__stdio.h +++ b/compiler/clib/__stdio.h @@ -2,7 +2,7 @@ #define ___STDIO_H /* - Copyright © 1995-2001, The AROS Development Team. All rights reserved. + Copyright © 1995-2007, The AROS Development Team. All rights reserved. $Id$ Desc: internal header file for stdio diff --git a/compiler/clib/close.c b/compiler/clib/close.c index 2eeb419482..530fbb31da 100644 --- a/compiler/clib/close.c +++ b/compiler/clib/close.c @@ -1,5 +1,5 @@ /* - Copyright © 1995-2003, The AROS Development Team. All rights reserved. + Copyright © 1995-2007, The AROS Development Team. All rights reserved. $Id$ ANSI C function close(). @@ -52,8 +52,6 @@ ******************************************************************************/ { fdesc *fdesc; - AROS_GET_SYSBASE_OK - AROS_GET_DOSBASE if (!(fdesc = __getfdesc(fd))) { diff --git a/compiler/clib/fclose.c b/compiler/clib/fclose.c index 4c3abdd5ee..5d56e638b9 100644 --- a/compiler/clib/fclose.c +++ b/compiler/clib/fclose.c @@ -1,5 +1,5 @@ /* - Copyright © 1995-2003, The AROS Development Team. All rights reserved. + Copyright © 1995-2007, The AROS Development Team. All rights reserved. $Id$ ANSI C function fclose(). @@ -51,7 +51,6 @@ ******************************************************************************/ { FILENODE * fn; - AROS_GET_SYSBASE_OK if (close(stream->fd) == -1) return EOF; diff --git a/compiler/clib/fdopen.c b/compiler/clib/fdopen.c index 767d786650..13d3b6cabf 100644 --- a/compiler/clib/fdopen.c +++ b/compiler/clib/fdopen.c @@ -1,5 +1,5 @@ /* - Copyright © 1995-2003, The AROS Development Team. All rights reserved. + Copyright © 1995-2007, The AROS Development Team. All rights reserved. $Id$ POSIX function fdopen(). @@ -68,8 +68,6 @@ fdesc *fdesc; FILENODE *fn; - AROS_GET_SYSBASE_OK - if (!(fdesc = __getfdesc(filedes))) { errno = EBADF; diff --git a/compiler/clib/fflush.c b/compiler/clib/fflush.c index 5b2efaaa3b..d31264d1e8 100644 --- a/compiler/clib/fflush.c +++ b/compiler/clib/fflush.c @@ -1,5 +1,5 @@ /* - Copyright © 1995-2003, The AROS Development Team. All rights reserved. + Copyright © 1995-2007, The AROS Development Team. All rights reserved. $Id$ ANSI C function fflush(). @@ -50,9 +50,6 @@ ******************************************************************************/ { - AROS_GET_SYSBASE_OK - AROS_GET_DOSBASE - /* flush all streams opened for output */ if (!stream) { diff --git a/compiler/clib/free.c b/compiler/clib/free.c index 827ac64979..b0673d369e 100644 --- a/compiler/clib/free.c +++ b/compiler/clib/free.c @@ -1,5 +1,5 @@ /* - Copyright © 1995-2003, The AROS Development Team. All rights reserved. + Copyright © 1995-2007, The AROS Development Team. All rights reserved. $Id$ ANSI C function free(). @@ -48,8 +48,6 @@ { if (memory) { - AROS_GET_SYSBASE_OK - unsigned char *mem; size_t size; diff --git a/compiler/clib/fsync.c b/compiler/clib/fsync.c index d41f1b1761..ae01a2581c 100644 --- a/compiler/clib/fsync.c +++ b/compiler/clib/fsync.c @@ -1,5 +1,5 @@ /* - Copyright © 2004, The AROS Development Team. All rights reserved. + Copyright © 2004-2007, The AROS Development Team. All rights reserved. $Id$ POSIX function fsync(). @@ -18,9 +18,6 @@ int fsync(int fd) /* FIXME: documentation */ { - AROS_GET_SYSBASE_OK - AROS_GET_DOSBASE - fdesc *fdesc = __getfdesc(fd); if (!fdesc || !(fdesc->flags & O_WRITE)) diff --git a/compiler/clib/malloc.c b/compiler/clib/malloc.c index 263a36cf36..de7e503bf4 100644 --- a/compiler/clib/malloc.c +++ b/compiler/clib/malloc.c @@ -1,5 +1,5 @@ /* - Copyright © 1995-2003, The AROS Development Team. All rights reserved. + Copyright © 1995-2007, The AROS Development Team. All rights reserved. $Id$ ANSI C function malloc(). @@ -53,7 +53,6 @@ ******************************************************************************/ { UBYTE *mem = NULL; - AROS_GET_SYSBASE_OK /* Allocate the memory */ mem = AllocPooled (__startup_mempool, size + AROS_ALIGN(sizeof(size_t))); @@ -72,8 +71,6 @@ int __init_memstuff(void) { - AROS_GET_SYSBASE_OK - __startup_mempool = CreatePool(MEMF_ANY | MEMF_SEM_PROTECTED, 4096L, 2000L); if (!__startup_mempool) @@ -87,8 +84,6 @@ int __init_memstuff(void) void __exit_memstuff(void) { - AROS_GET_SYSBASE_OK - if (__startup_mempool) { DeletePool(__startup_mempool); diff --git a/compiler/clib/mktemp.c b/compiler/clib/mktemp.c index 937aa5cafc..be0659c27c 100644 --- a/compiler/clib/mktemp.c +++ b/compiler/clib/mktemp.c @@ -1,5 +1,5 @@ /* - Copyright © 1995-2003, The AROS Development Team. All rights reserved. + Copyright © 1995-2007, The AROS Development Team. All rights reserved. $Id$ */ @@ -57,7 +57,6 @@ ******************************************************************************/ { - AROS_GET_SYSBASE_OK ULONG pid = (ULONG)FindTask(0L); char *c = template + strlen(template); BPTR lock; diff --git a/compiler/clib/realloc.c b/compiler/clib/realloc.c index a8be435d23..6e2329de7c 100644 --- a/compiler/clib/realloc.c +++ b/compiler/clib/realloc.c @@ -1,5 +1,5 @@ /* - Copyright © 1995-2003, The AROS Development Team. All rights reserved. + Copyright © 1995-2007, The AROS Development Team. All rights reserved. $Id$ ANSI C function realloc(). @@ -56,7 +56,6 @@ { UBYTE * mem, * newmem; size_t oldsize; - AROS_GET_SYSBASE_OK if (!oldmem) return malloc (size); diff --git a/compiler/clib/vfprintf.c b/compiler/clib/vfprintf.c index e9d4fe04a6..b45f102e99 100644 --- a/compiler/clib/vfprintf.c +++ b/compiler/clib/vfprintf.c @@ -1,5 +1,5 @@ /* - Copyright © 1995-2001, The AROS Development Team. All rights reserved. + Copyright © 1995-2007, The AROS Development Team. All rights reserved. $Id$ Format a string and call a usercallback to output each char. @@ -64,8 +64,6 @@ static int __putc(int c, BPTR fh); static int __putc(int c, BPTR fh) { - AROS_GET_SYSBASE_OK - AROS_GET_DOSBASE if (FPutC(fh, c) == EOF) { errno = IoErr2errno(IoErr()); diff --git a/compiler/clib/write.c b/compiler/clib/write.c index 5472aa4730..be7c5d6245 100644 --- a/compiler/clib/write.c +++ b/compiler/clib/write.c @@ -1,5 +1,5 @@ /* - Copyright © 1995-2001, The AROS Development Team. All rights reserved. + Copyright © 1995-2007, The AROS Development Team. All rights reserved. $Id$ ANSI C function write(). @@ -49,8 +49,6 @@ ******************************************************************************/ { - AROS_GET_SYSBASE_OK - ssize_t cnt; fdesc *fdesc = __getfdesc(fd); diff --git a/compiler/coolimages/buttonclass.c b/compiler/coolimages/buttonclass.c index 6163fe1ab6..cc36b39ef7 100644 --- a/compiler/coolimages/buttonclass.c +++ b/compiler/coolimages/buttonclass.c @@ -1,5 +1,5 @@ /* - Copyright © 1995-2001, The AROS Development Team. All rights reserved. + Copyright © 1995-2007, The AROS Development Team. All rights reserved. $Id$ Desc: @@ -76,7 +76,6 @@ static void getgadgetcoords(struct Gadget *gad, struct GadgetInfo *gi, static IPTR coolbutton_new(Class * cl, Object * o, struct opSet * msg) { - AROS_GET_SYSBASE_OK struct CoolButtonData *data; struct TagItem fitags[] = { @@ -130,7 +129,6 @@ static IPTR coolbutton_new(Class * cl, Object * o, struct opSet * msg) static IPTR coolbutton_dispose(Class * cl, Object * o, Msg msg) { - AROS_GET_SYSBASE_OK struct CoolButtonData *data; data = INST_DATA(cl, o); @@ -321,7 +319,6 @@ AROS_UFH3S(IPTR, cool_buttonclass_dispatcher, BOOL InitCoolButtonClass(struct Library *CyberGfxBase) { - AROS_GET_SYSBASE_OK BOOL retval = FALSE; cool_cybergfxbase = CyberGfxBase; diff --git a/compiler/coolimages/imageclass.c b/compiler/coolimages/imageclass.c index 841a14e90b..e3883fc30a 100644 --- a/compiler/coolimages/imageclass.c +++ b/compiler/coolimages/imageclass.c @@ -1,5 +1,5 @@ /* - Copyright © 1995-2001, The AROS Development Team. All rights reserved. + Copyright © 1995-2007, The AROS Development Team. All rights reserved. $Id$ */ @@ -55,7 +55,6 @@ static struct Library *cool_cybergfxbase; static IPTR coolimage_new(Class * cl, Object * o, struct opSet * msg) { - AROS_GET_SYSBASE_OK struct CoolImageData *data; o = (Object *)DoSuperMethodA(cl, o, (Msg)msg); @@ -103,7 +102,6 @@ static IPTR coolimage_new(Class * cl, Object * o, struct opSet * msg) static IPTR coolimage_dispose(Class * cl, Object * o, Msg msg) { - AROS_GET_SYSBASE_OK struct CoolImageData *data; data = INST_DATA(cl, o); @@ -192,7 +190,6 @@ AROS_UFH3S(IPTR, cool_imageclass_dispatcher, BOOL InitCoolImageClass(struct Library *CyberGfxBase) { - AROS_GET_SYSBASE_OK BOOL retval = FALSE; cool_cybergfxbase = CyberGfxBase; diff --git a/compiler/include/aros/cpu.h b/compiler/include/aros/cpu.h index d4b20c60fb..80a12e25e2 100644 --- a/compiler/include/aros/cpu.h +++ b/compiler/include/aros/cpu.h @@ -1,7 +1,7 @@ #ifndef AROS_CPU_H #define AROS_CPU_H /* - Copyright © 1995-2003, The AROS Development Team. All rights reserved. + Copyright © 1995-2007, The AROS Development Team. All rights reserved. $Id$ CPU independent version of the header. This is the one @@ -191,19 +191,6 @@ # endif #endif -/***************************************************************************** - * Miscellaneous - ****************************************************************************/ -#ifndef AROS_GET_SYSBASE -# define AROS_GET_SYSBASE extern struct ExecBase *SysBase; -#endif -#ifndef AROS_GET_DOSBASE -# define AROS_GET_DOSBASE extern struct DosLibrary *DOSBase; -#endif -#ifndef AROS_GET_SYSBASE_OK -# define AROS_GET_SYSBASE_OK extern struct ExecBase *SysBase; -#endif - /* The SP_OFFSET should be defined *ONLY* when not defined before. Otherwise it would redefine daults from cpu-arch.h or machine.h file diff --git a/rom/dos/lddemon.c b/rom/dos/lddemon.c index fd172d98d6..8f17be5ef4 100644 --- a/rom/dos/lddemon.c +++ b/rom/dos/lddemon.c @@ -1,5 +1,5 @@ /* - Copyright © 1995-2004, The AROS Development Team. All rights reserved. + Copyright © 1995-2007, The AROS Development Team. All rights reserved. $Id$ Loader for shared libraries and devices. @@ -820,7 +820,6 @@ AROS_UFH3(ULONG, AROS_SLIB_ENTRY(Init, LDDemon), ) { AROS_USERFUNC_INIT - AROS_GET_SYSBASE struct Library *AROS_SLIB_ENTRY(OpenLibrary,Dos)(); BYTE AROS_SLIB_ENTRY(OpenDevice,Dos)(); diff --git a/rom/exec/addhead.c b/rom/exec/addhead.c index f57604a85c..ac35867c42 100644 --- a/rom/exec/addhead.c +++ b/rom/exec/addhead.c @@ -1,5 +1,5 @@ /* - Copyright © 1995-2001, The AROS Development Team. All rights reserved. + Copyright © 1995-2007, The AROS Development Team. All rights reserved. $Id$ Desc: Add a node to the head of a list @@ -52,7 +52,6 @@ ******************************************************************************/ { AROS_LIBFUNC_INIT - AROS_GET_SYSBASE ASSERT_VALID_PTR(node); ASSERT_VALID_PTR(list); diff --git a/rom/exec/addtail.c b/rom/exec/addtail.c index 91d821470b..e16fec4d9d 100644 --- a/rom/exec/addtail.c +++ b/rom/exec/addtail.c @@ -1,5 +1,5 @@ /* - Copyright © 1995-2001, The AROS Development Team. All rights reserved. + Copyright © 1995-2007, The AROS Development Team. All rights reserved. $Id$ Desc: Add a node at the end of a list. @@ -49,7 +49,6 @@ ******************************************************************************/ { AROS_LIBFUNC_INIT - AROS_GET_SYSBASE // ASSERT_VALID_PTR(node); argh! TypeOfMem() doesn't know about the data segment! ASSERT_VALID_PTR(list); diff --git a/rom/exec/prepareexecbase.c b/rom/exec/prepareexecbase.c index bef5ba00e4..334f64de4d 100644 --- a/rom/exec/prepareexecbase.c +++ b/rom/exec/prepareexecbase.c @@ -1,5 +1,5 @@ /* - Copyright © 1995-2001, The AROS Development Team. All rights reserved. + Copyright © 1995-2007, The AROS Development Team. All rights reserved. $Id$ Desc: Sets up the ExecBase a bit. (Mostly clearing). @@ -76,12 +76,6 @@ struct ExecBase *PrepareExecBase(struct MemHeader *mh) ULONG negsize = 0, i; VOID **fp = LIBFUNCTABLE; - /* - Basically this does not get anything useful, but I still need to have - SysBase defined here... - */ - AROS_GET_SYSBASE - /* Calculate the size of the vector table */ while (*fp++ != (VOID *) -1) negsize += LIB_VECTSIZE; -- 2.11.4.GIT