diff options
author | Thomas Schwinge <tschwinge@gnu.org> | 2006-02-20 20:59:40 +0000 |
---|---|---|
committer | Thomas Schwinge <tschwinge@gnu.org> | 2009-06-18 00:26:35 +0200 |
commit | 44b9d528984254f021865f65c0e7749f3d9d97f4 (patch) | |
tree | f5ec614b22fbc343c4d2de22473f77266c18d7c8 /i386/util/i16 | |
parent | b3d4954f3269685d4200149e7334cdcdc935c287 (diff) |
2006-02-20 Thomas Schwinge <tschwinge@gnu.org>
Remove unused and unsupported code. Consult the file
`DEVELOPMENT' for details. Partly based on suggestions by
Gianluca Guida <glguida@gmail.com>.
* i386/util/NOTES: Remove file.
* i386/util/anno.c: Likewise.
* i386/util/anno.h: Likewise.
* i386/util/cpu.h: Likewise.
* i386/util/cpu_subs.h: Likewise.
* i386/util/cpu_tables_init.c: Likewise.
* i386/util/cpu_tables_load.c: Likewise.
* i386/util/crtn.S: Likewise.
* i386/util/debug.h: Likewise.
* i386/util/gdt.c: Likewise.
* i386/util/gdt.h: Likewise.
* i386/util/gdt_sels.h: Likewise.
* i386/util/i16/debug.h: Likewise.
* i386/util/i16/i16.h: Likewise.
* i386/util/i16/i16_die.c: Likewise.
* i386/util/i16/i16_gdt_init_temp.c: Likewise.
* i386/util/i16/i16_nanodelay.c: Likewise.
* i386/util/i16/i16_puts.c: Likewise.
* i386/util/i16/i16_writehex.c: Likewise.
* i386/util/i386_asm.sym: Likewise.
* i386/util/idt.c: Likewise.
* i386/util/idt.h: Likewise.
* i386/util/idt_inittab.S: Likewise.
* i386/util/idt_inittab.h: Likewise.
* i386/util/ldt.h: Likewise.
* i386/util/trap.h: Likewise.
* i386/util/trap_asm.sym: Likewise.
* i386/util/trap_dump.c: Likewise.
* i386/util/trap_dump_die.c: Likewise.
* i386/util/trap_handler.S: Likewise.
* i386/util/trap_return.S: Likewise.
* i386/util/tss.c: Likewise.
* i386/util/tss.h: Likewise.
* i386/util/tss_dump.c: Likewise.
* i386/util/vm_param.h: Likewise.
Diffstat (limited to 'i386/util/i16')
-rw-r--r-- | i386/util/i16/debug.h | 42 | ||||
-rw-r--r-- | i386/util/i16/i16.h | 58 | ||||
-rw-r--r-- | i386/util/i16/i16_die.c | 34 | ||||
-rw-r--r-- | i386/util/i16/i16_gdt_init_temp.c | 53 | ||||
-rw-r--r-- | i386/util/i16/i16_nanodelay.c | 35 | ||||
-rw-r--r-- | i386/util/i16/i16_puts.c | 34 | ||||
-rw-r--r-- | i386/util/i16/i16_writehex.c | 57 |
7 files changed, 0 insertions, 313 deletions
diff --git a/i386/util/i16/debug.h b/i386/util/i16/debug.h deleted file mode 100644 index 6bce9d2..0000000 --- a/i386/util/i16/debug.h +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright (c) 1995 The University of Utah and - * the Computer Systems Laboratory at the University of Utah (CSL). - * All rights reserved. - * - * Permission to use, copy, modify and distribute this software is hereby - * granted provided that (1) source code retains these copyright, permission, - * and disclaimer notices, and (2) redistributions including binaries - * reproduce the notices in supporting documentation, and (3) all advertising - * materials mentioning features or use of this software display the following - * acknowledgement: ``This product includes software developed by the - * Computer Systems Laboratory at the University of Utah.'' - * - * THE UNIVERSITY OF UTAH AND CSL ALLOW FREE USE OF THIS SOFTWARE IN ITS "AS - * IS" CONDITION. THE UNIVERSITY OF UTAH AND CSL DISCLAIM ANY LIABILITY OF - * ANY KIND FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE. - * - * CSL requests users of this software to return to csl-dist@cs.utah.edu any - * improvements that they make and grant CSL redistribution rights. - * - * Author: Bryan Ford, University of Utah CSL - */ -#ifndef _UTIL_I386_I16_DEBUG_H_ -#define _UTIL_I386_I16_DEBUG_H_ - -#include_next "debug.h" - -#ifdef DEBUG - -#define i16_assert(v) \ - MACRO_BEGIN \ - if (!(v)) \ - i16_die(__FILE__":?: failed assertion `"#v"'"); \ - MACRO_END - -#else /* !DEBUG */ - -#define i16_assert(v) (0) - -#endif /* !DEBUG */ - -#endif /* _UTIL_I386_I16_DEBUG_H_ */ diff --git a/i386/util/i16/i16.h b/i386/util/i16/i16.h deleted file mode 100644 index 0eae59a..0000000 --- a/i386/util/i16/i16.h +++ /dev/null @@ -1,58 +0,0 @@ -/* - * Copyright (c) 1995-1994 The University of Utah and - * the Computer Systems Laboratory at the University of Utah (CSL). - * All rights reserved. - * - * Permission to use, copy, modify and distribute this software is hereby - * granted provided that (1) source code retains these copyright, permission, - * and disclaimer notices, and (2) redistributions including binaries - * reproduce the notices in supporting documentation, and (3) all advertising - * materials mentioning features or use of this software display the following - * acknowledgement: ``This product includes software developed by the - * Computer Systems Laboratory at the University of Utah.'' - * - * THE UNIVERSITY OF UTAH AND CSL ALLOW FREE USE OF THIS SOFTWARE IN ITS "AS - * IS" CONDITION. THE UNIVERSITY OF UTAH AND CSL DISCLAIM ANY LIABILITY OF - * ANY KIND FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE. - * - * CSL requests users of this software to return to csl-dist@cs.utah.edu any - * improvements that they make and grant CSL redistribution rights. - * - * Author: Bryan Ford, University of Utah CSL - */ -#ifndef _I386_I16_ -#define _I386_I16_ - -#include <mach/machine/code16.h> - -#include "gdt.h" - - -/* Macros to switch between 16-bit and 32-bit code - in the middle of a C function. - Be careful with these! */ -#define i16_switch_to_32bit() asm volatile(" - ljmp %0,$1f - .code32 - 1: - " : : "i" (KERNEL_CS)); -#define switch_to_16bit() asm volatile(" - ljmp %0,$1f - .code16 - 1: - " : : "i" (KERNEL_16_CS)); - - -/* From within one type of code, execute 'stmt' in the other. - These are safer and harder to screw up with than the above macros. */ -#define i16_do_32bit(stmt) \ - ({ i16_switch_to_32bit(); \ - { stmt; } \ - switch_to_16bit(); }) -#define do_16bit(stmt) \ - ({ switch_to_16bit(); \ - { stmt; } \ - i16_switch_to_32bit(); }) - - -#endif _I386_I16_ diff --git a/i386/util/i16/i16_die.c b/i386/util/i16/i16_die.c deleted file mode 100644 index e3cd533..0000000 --- a/i386/util/i16/i16_die.c +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright (c) 1995-1994 The University of Utah and - * the Computer Systems Laboratory at the University of Utah (CSL). - * All rights reserved. - * - * Permission to use, copy, modify and distribute this software is hereby - * granted provided that (1) source code retains these copyright, permission, - * and disclaimer notices, and (2) redistributions including binaries - * reproduce the notices in supporting documentation, and (3) all advertising - * materials mentioning features or use of this software display the following - * acknowledgement: ``This product includes software developed by the - * Computer Systems Laboratory at the University of Utah.'' - * - * THE UNIVERSITY OF UTAH AND CSL ALLOW FREE USE OF THIS SOFTWARE IN ITS "AS - * IS" CONDITION. THE UNIVERSITY OF UTAH AND CSL DISCLAIM ANY LIABILITY OF - * ANY KIND FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE. - * - * CSL requests users of this software to return to csl-dist@cs.utah.edu any - * improvements that they make and grant CSL redistribution rights. - * - * Author: Bryan Ford, University of Utah CSL - */ - -#include <mach/machine/code16.h> - -CODE16 - -void i16_die(char *mes) -{ - if (mes) - i16_puts(mes); - - i16_exit(mes != 0); -} diff --git a/i386/util/i16/i16_gdt_init_temp.c b/i386/util/i16/i16_gdt_init_temp.c deleted file mode 100644 index 14f2d0e..0000000 --- a/i386/util/i16/i16_gdt_init_temp.c +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Copyright (c) 1995-1994 The University of Utah and - * the Computer Systems Laboratory at the University of Utah (CSL). - * All rights reserved. - * - * Permission to use, copy, modify and distribute this software is hereby - * granted provided that (1) source code retains these copyright, permission, - * and disclaimer notices, and (2) redistributions including binaries - * reproduce the notices in supporting documentation, and (3) all advertising - * materials mentioning features or use of this software display the following - * acknowledgement: ``This product includes software developed by the - * Computer Systems Laboratory at the University of Utah.'' - * - * THE UNIVERSITY OF UTAH AND CSL ALLOW FREE USE OF THIS SOFTWARE IN ITS "AS - * IS" CONDITION. THE UNIVERSITY OF UTAH AND CSL DISCLAIM ANY LIABILITY OF - * ANY KIND FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE. - * - * CSL requests users of this software to return to csl-dist@cs.utah.edu any - * improvements that they make and grant CSL redistribution rights. - * - * Author: Bryan Ford, University of Utah CSL - */ - -#include <mach/machine/code16.h> -#include <mach/machine/seg.h> - -#include "vm_param.h" -#include "cpu.h" - - -CODE16 - -/* This 16-bit function initializes CPU 0's GDT - just enough to get in and out of protected (and possibly paged) mode, - with all addresses assuming identity-mapped memory. */ -void i16_gdt_init_temp() -{ - /* Create temporary kernel code and data segment descriptors. - (They'll be reinitialized later after paging is enabled.) */ - i16_fill_gdt_descriptor(&cpu[0], KERNEL_CS, - boot_image_pa, 0xffffffff, - ACC_PL_K|ACC_CODE_R, SZ_32); - i16_fill_gdt_descriptor(&cpu[0], KERNEL_DS, - boot_image_pa, 0xffffffff, - ACC_PL_K|ACC_DATA_W, SZ_32); - i16_fill_gdt_descriptor(&cpu[0], KERNEL_16_CS, - boot_image_pa, 0xffff, - ACC_PL_K|ACC_CODE_R, SZ_16); - i16_fill_gdt_descriptor(&cpu[0], KERNEL_16_DS, - boot_image_pa, 0xffff, - ACC_PL_K|ACC_DATA_W, SZ_16); -} - diff --git a/i386/util/i16/i16_nanodelay.c b/i386/util/i16/i16_nanodelay.c deleted file mode 100644 index 7b23cb5..0000000 --- a/i386/util/i16/i16_nanodelay.c +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright (c) 1995-1994 The University of Utah and - * the Computer Systems Laboratory at the University of Utah (CSL). - * All rights reserved. - * - * Permission to use, copy, modify and distribute this software is hereby - * granted provided that (1) source code retains these copyright, permission, - * and disclaimer notices, and (2) redistributions including binaries - * reproduce the notices in supporting documentation, and (3) all advertising - * materials mentioning features or use of this software display the following - * acknowledgement: ``This product includes software developed by the - * Computer Systems Laboratory at the University of Utah.'' - * - * THE UNIVERSITY OF UTAH AND CSL ALLOW FREE USE OF THIS SOFTWARE IN ITS "AS - * IS" CONDITION. THE UNIVERSITY OF UTAH AND CSL DISCLAIM ANY LIABILITY OF - * ANY KIND FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE. - * - * CSL requests users of this software to return to csl-dist@cs.utah.edu any - * improvements that they make and grant CSL redistribution rights. - * - * Author: Bryan Ford, University of Utah CSL - */ - -#include <mach/machine/code16.h> - -CODE16 - -/* XXX */ -void i16_nanodelay(int ns) -{ - asm("jmp 1f; 1:"); - asm("jmp 1f; 1:"); - asm("jmp 1f; 1:"); -} - diff --git a/i386/util/i16/i16_puts.c b/i386/util/i16/i16_puts.c deleted file mode 100644 index c43a3e1..0000000 --- a/i386/util/i16/i16_puts.c +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright (c) 1995-1994 The University of Utah and - * the Computer Systems Laboratory at the University of Utah (CSL). - * All rights reserved. - * - * Permission to use, copy, modify and distribute this software is hereby - * granted provided that (1) source code retains these copyright, permission, - * and disclaimer notices, and (2) redistributions including binaries - * reproduce the notices in supporting documentation, and (3) all advertising - * materials mentioning features or use of this software display the following - * acknowledgement: ``This product includes software developed by the - * Computer Systems Laboratory at the University of Utah.'' - * - * THE UNIVERSITY OF UTAH AND CSL ALLOW FREE USE OF THIS SOFTWARE IN ITS "AS - * IS" CONDITION. THE UNIVERSITY OF UTAH AND CSL DISCLAIM ANY LIABILITY OF - * ANY KIND FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE. - * - * CSL requests users of this software to return to csl-dist@cs.utah.edu any - * improvements that they make and grant CSL redistribution rights. - * - * Author: Bryan Ford, University of Utah CSL - */ - -#include <mach/machine/code16.h> - -CODE16 - -void i16_puts(const char *mes) -{ - while (*mes) - i16_putchar(*mes++); - i16_putchar('\n'); -} - diff --git a/i386/util/i16/i16_writehex.c b/i386/util/i16/i16_writehex.c deleted file mode 100644 index 4a1b2af..0000000 --- a/i386/util/i16/i16_writehex.c +++ /dev/null @@ -1,57 +0,0 @@ -/* - * Copyright (c) 1995-1994 The University of Utah and - * the Computer Systems Laboratory at the University of Utah (CSL). - * All rights reserved. - * - * Permission to use, copy, modify and distribute this software is hereby - * granted provided that (1) source code retains these copyright, permission, - * and disclaimer notices, and (2) redistributions including binaries - * reproduce the notices in supporting documentation, and (3) all advertising - * materials mentioning features or use of this software display the following - * acknowledgement: ``This product includes software developed by the - * Computer Systems Laboratory at the University of Utah.'' - * - * THE UNIVERSITY OF UTAH AND CSL ALLOW FREE USE OF THIS SOFTWARE IN ITS "AS - * IS" CONDITION. THE UNIVERSITY OF UTAH AND CSL DISCLAIM ANY LIABILITY OF - * ANY KIND FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE. - * - * CSL requests users of this software to return to csl-dist@cs.utah.edu any - * improvements that they make and grant CSL redistribution rights. - * - * Author: Bryan Ford, University of Utah CSL - */ - -#include <mach/machine/code16.h> - -CODE16 - -void i16_writehexdigit(unsigned char digit) -{ - digit &= 0xf; - i16_putchar(digit < 10 ? digit+'0' : digit-10+'A'); -} - -void i16_writehexb(unsigned char val) -{ - i16_writehexdigit(val >> 4); - i16_writehexdigit(val); -} - -void i16_writehexw(unsigned short val) -{ - i16_writehexb(val >> 8); - i16_writehexb(val); -} - -void i16_writehexl(unsigned long val) -{ - i16_writehexw(val >> 16); - i16_writehexw(val); -} - -void i16_writehexll(unsigned long long val) -{ - i16_writehexl(val >> 32); - i16_writehexl(val); -} - |