r28 - in openbios-devel: arch/amd64 arch/sparc32 arch/x86 include/amd64 include/openbios include/ppc include/x86 kernel
Author: stepan Date: 2006-05-23 00:36:01 +0200 (Tue, 23 May 2006) New Revision: 28
Modified: openbios-devel/arch/amd64/openbios.c openbios-devel/arch/sparc32/openbios.c openbios-devel/arch/x86/openbios.c openbios-devel/include/amd64/io.h openbios-devel/include/openbios/bindings.h openbios-devel/include/openbios/drivers.h openbios-devel/include/ppc/io.h openbios-devel/include/x86/io.h openbios-devel/kernel/forth.c openbios-devel/kernel/internal.c Log: drop io from bootstrap and exception stuff from non-bootstrap compiles.
Modified: openbios-devel/arch/amd64/openbios.c =================================================================== --- openbios-devel/arch/amd64/openbios.c 2006-05-22 22:16:20 UTC (rev 27) +++ openbios-devel/arch/amd64/openbios.c 2006-05-22 22:36:01 UTC (rev 28) @@ -34,14 +34,6 @@ PUSH(0x9FFFF); }
-void exception(cell no) -{ - /* The exception mechanism is used during bootstrap to catch - * build errors. In a running system this is a noop since we - * can't break out to the unix host os anyways. - */ -} - static void arch_init( void ) {
Modified: openbios-devel/arch/sparc32/openbios.c =================================================================== --- openbios-devel/arch/sparc32/openbios.c 2006-05-22 22:16:20 UTC (rev 27) +++ openbios-devel/arch/sparc32/openbios.c 2006-05-22 22:36:01 UTC (rev 28) @@ -39,14 +39,6 @@ PUSH((unsigned int)&_eheap); }
-void exception(__attribute__((unused))cell no) -{ - /* The exception mechanism is used during bootstrap to catch - * build errors. In a running system this is a noop since we - * can't break out to the unix host os anyways. - */ -} - static void arch_init( void ) {
Modified: openbios-devel/arch/x86/openbios.c =================================================================== --- openbios-devel/arch/x86/openbios.c 2006-05-22 22:16:20 UTC (rev 27) +++ openbios-devel/arch/x86/openbios.c 2006-05-22 22:36:01 UTC (rev 28) @@ -34,14 +34,6 @@ PUSH(0x9FFFF); }
-void exception(cell no) -{ - /* The exception mechanism is used during bootstrap to catch - * build errors. In a running system this is a noop since we - * can't break out to the unix host os anyways. - */ -} - static void arch_init( void ) {
Modified: openbios-devel/include/amd64/io.h =================================================================== --- openbios-devel/include/amd64/io.h 2006-05-22 22:16:20 UTC (rev 27) +++ openbios-devel/include/amd64/io.h 2006-05-22 22:36:01 UTC (rev 28) @@ -42,27 +42,8 @@ __asm__ __volatile__("rep; ins" #bwl : "+D"(addr), "+c"(count) : "d"(port)); \ }
-#ifndef BOOTSTRAP BUILDIO(b,b,char) BUILDIO(w,w,short) BUILDIO(l,,int) -#else -#ifdef FCOMPILER -#define inb(reg) ((u8)0xff) -#define inw(reg) ((u16)0xffff) -#define inl(reg) ((u32)0xffffffff) -#define outb(reg, val) /* nothing */ -#define outw(reg, val) /* nothing */ -#define outl(reg, val) /* nothing */ -#else -extern u8 inb( u32 reg ); -extern u16 inw( u32 reg ); -extern u32 inl( u32 reg ); -extern void insw( u32 reg, void *addr, unsigned long count ); -extern void outb( u32 reg, u8 val ); -extern void outw( u32 reg, u16 val ); -extern void outl( u32 reg, u32 val ); -extern void outsw( u32 reg, const void *addr, unsigned long count); + #endif -#endif -#endif
Modified: openbios-devel/include/openbios/bindings.h =================================================================== --- openbios-devel/include/openbios/bindings.h 2006-05-22 22:16:20 UTC (rev 27) +++ openbios-devel/include/openbios/bindings.h 2006-05-22 22:36:01 UTC (rev 28) @@ -26,7 +26,6 @@
/* initialization */ extern int initialize_forth( void ); -extern void exception( cell errcode );
/* panic */ extern int forth_segv_handler( char *segv_addr );
Modified: openbios-devel/include/openbios/drivers.h =================================================================== --- openbios-devel/include/openbios/drivers.h 2006-05-22 22:16:20 UTC (rev 27) +++ openbios-devel/include/openbios/drivers.h 2006-05-22 22:36:01 UTC (rev 28) @@ -21,7 +21,7 @@ int ob_ide_init(void); #endif #ifdef CONFIG_DRIVER_ESP -int ob_esp_init(void); +int ob_esp_init(unsigned long base); #endif #ifdef CONFIG_DRIVER_OBIO int ob_obio_init(unsigned long slavio_base);
Modified: openbios-devel/include/ppc/io.h =================================================================== --- openbios-devel/include/ppc/io.h 2006-05-22 22:16:20 UTC (rev 27) +++ openbios-devel/include/ppc/io.h 2006-05-22 22:36:01 UTC (rev 28) @@ -143,23 +143,6 @@ ns--; } } -#else /* BOOTSTRAP */ -#ifdef FCOMPILER -#define inb(reg) ((u8)0xff) -#define inw(reg) ((u16)0xffff) -#define inl(reg) ((u32)0xffffffff) -#define outb(reg, val) // nothing -#define outw(reg, val) // nothing -#define outl(reg, val) // nothing -#else -extern u8 inb(u32 reg); -extern u16 inw(u32 reg); -extern u32 inl(u32 reg); -extern void insw(u32 reg, void *addr, unsigned long count); -extern void outb(u32 reg, u8 val); -extern void outw(u32 reg, u16 val); -extern void outl(u32 reg, u32 val); -extern void outsw(u32 reg, const void *addr, unsigned long count); #endif -#endif + #endif /* _ASM_IO_H */
Modified: openbios-devel/include/x86/io.h =================================================================== --- openbios-devel/include/x86/io.h 2006-05-22 22:16:20 UTC (rev 27) +++ openbios-devel/include/x86/io.h 2006-05-22 22:36:01 UTC (rev 28) @@ -46,25 +46,6 @@ BUILDIO(b,b,char) BUILDIO(w,w,short) BUILDIO(l,,int) -#else -#ifdef FCOMPILER -#define inb(reg) ((u8)0xff) -#define inw(reg) ((u16)0xffff) -#define inl(reg) ((u32)0xffffffff) -// #define insw( u32 reg, void *addr, unsigned long count ); -#define outb(reg, val) // nothing -#define outw(reg, val) // nothing -#define outl(reg, val) // nothing -// #define outsw( u32 reg, const void *addr, unsigned long count); -#else -extern u8 inb( u32 reg ); -extern u16 inw( u32 reg ); -extern u32 inl( u32 reg ); -extern void insw( u32 reg, void *addr, unsigned long count ); -extern void outb( u32 reg, u8 val ); -extern void outw( u32 reg, u16 val ); -extern void outl( u32 reg, u32 val ); -extern void outsw( u32 reg, const void *addr, unsigned long count); #endif + #endif -#endif
Modified: openbios-devel/kernel/forth.c =================================================================== --- openbios-devel/kernel/forth.c 2006-05-22 22:16:20 UTC (rev 27) +++ openbios-devel/kernel/forth.c 2006-05-22 22:36:01 UTC (rev 28) @@ -796,9 +796,11 @@
static void emit(void) { +#ifndef FCOMPILER cell tmp = POP(); -#ifndef FCOMPILER putchar(tmp); +#else + (void) POP(); #endif }
@@ -834,8 +836,13 @@
static void iocfetch(void) { +#ifndef FCOMPILER cell reg = POP(); PUSH(inb(reg)); +#else + (void)POP(); + PUSH(0); +#endif }
@@ -845,8 +852,13 @@
static void iowfetch(void) { +#ifndef FCOMPILER cell reg = POP(); PUSH(inw(reg)); +#else + (void)POP(); + PUSH(0); +#endif }
/* @@ -855,8 +867,13 @@
static void iolfetch(void) { +#ifndef FCOMPILER cell reg = POP(); PUSH(inl(reg)); +#else + (void)POP(); + PUSH(0); +#endif }
@@ -866,10 +883,15 @@
static void iocstore(void) { +#ifndef FCOMPILER cell reg = POP(); cell val = POP();
outb(reg, val); +#else + (void)POP(); + (void)POP(); +#endif }
@@ -879,10 +901,15 @@
static void iowstore(void) { +#ifndef FCOMPILER cell reg = POP(); cell val = POP();
outw(reg, val); +#else + (void)POP(); + (void)POP(); +#endif }
@@ -892,10 +919,15 @@
static void iolstore(void) { +#ifndef FCOMPILER ucell reg = POP(); ucell val = POP();
outl(reg, val); +#else + (void)POP(); + (void)POP(); +#endif }
/*
Modified: openbios-devel/kernel/internal.c =================================================================== --- openbios-devel/kernel/internal.c 2006-05-22 22:16:20 UTC (rev 27) +++ openbios-devel/kernel/internal.c 2006-05-22 22:36:01 UTC (rev 28) @@ -179,7 +179,9 @@ static void sysdebug(void) { cell errorno=POP(); +#ifdef FCOMPILER exception(errorno); +#endif }
static void dodoes(void)
-
svn＠openbios.org