diff options
author | Miod Vallat <miod@cvs.openbsd.org> | 2006-02-22 22:16:09 +0000 |
---|---|---|
committer | Miod Vallat <miod@cvs.openbsd.org> | 2006-02-22 22:16:09 +0000 |
commit | c3347acce9dab037b66772e270f9935d9d7ba5bd (patch) | |
tree | 8968fb49d6d07f31d5731907194a1559b1b18cf1 | |
parent | 9168b215c64ce0c0cd06224dfd37565ac47133b8 (diff) |
Remove unused _{ins,rem}que functions - they were not even implemented on
all architectures.
-rw-r--r-- | sys/arch/i386/i386/machdep.c | 41 | ||||
-rw-r--r-- | sys/arch/m68k/m68k/support.s | 29 | ||||
-rw-r--r-- | sys/arch/solbourne/solbourne/locore.s | 27 | ||||
-rw-r--r-- | sys/arch/sparc/sparc/locore.s | 27 | ||||
-rw-r--r-- | sys/arch/vax/include/macros.h | 20 | ||||
-rw-r--r-- | sys/sys/systm.h | 9 |
6 files changed, 6 insertions, 147 deletions
diff --git a/sys/arch/i386/i386/machdep.c b/sys/arch/i386/i386/machdep.c index 0058051f201..545e13b2c37 100644 --- a/sys/arch/i386/i386/machdep.c +++ b/sys/arch/i386/i386/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.339 2006/01/12 22:39:20 weingart Exp $ */ +/* $OpenBSD: machdep.c,v 1.340 2006/02/22 22:16:05 miod Exp $ */ /* $NetBSD: machdep.c,v 1.214 1996/11/10 03:16:17 thorpej Exp $ */ /*- @@ -3079,45 +3079,6 @@ init386(paddr_t first_avail) #endif /* KGDB */ } -struct queue { - struct queue *q_next, *q_prev; -}; - -/* - * insert an element into a queue - */ -void -_insque(v1, v2) - void *v1; - void *v2; -{ - register struct queue *elem = v1, *head = v2; - register struct queue *next; - - next = head->q_next; - elem->q_next = next; - head->q_next = elem; - elem->q_prev = head; - next->q_prev = elem; -} - -/* - * remove an element from a queue - */ -void -_remque(v) - void *v; -{ - register struct queue *elem = v; - register struct queue *next, *prev; - - next = elem->q_next; - prev = elem->q_prev; - next->q_prev = prev; - prev->q_next = next; - elem->q_prev = 0; -} - /* * cpu_exec_aout_makecmds(): * cpu-dependent a.out format hook for execve(). diff --git a/sys/arch/m68k/m68k/support.s b/sys/arch/m68k/m68k/support.s index cab75e4edbc..433f05ff302 100644 --- a/sys/arch/m68k/m68k/support.s +++ b/sys/arch/m68k/m68k/support.s @@ -1,4 +1,4 @@ -/* $OpenBSD: support.s,v 1.2 2003/06/02 23:27:48 millert Exp $ */ +/* $OpenBSD: support.s,v 1.3 2006/02/22 22:16:07 miod Exp $ */ /* $NetBSD: support.s,v 1.1 1997/03/16 10:47:33 thorpej Exp $ */ /* @@ -66,30 +66,3 @@ ENTRY(longjmp) movl a0@,sp@ moveq #1,d0 rts - -/* - * the queue functions - */ -ENTRY(_insque) - movw sr,d0 - movw #PSL_HIGHIPL,sr | atomic - movl sp@(8),a0 | where to insert (after) - movl sp@(4),a1 | element to insert (e) - movl a0@,a1@ | e->next = after->next - movl a0,a1@(4) | e->prev = after - movl a1,a0@ | after->next = e - movl a1@,a0 - movl a1,a0@(4) | e->next->prev = e - movw d0,sr - rts - -ENTRY(_remque) - movw sr,d0 - movw #PSL_HIGHIPL,sr | atomic - movl sp@(4),a0 | element to remove (e) - movl a0@,a1 - movl a0@(4),a0 - movl a0,a1@(4) | e->next->prev = e->prev - movl a1,a0@ | e->prev->next = e->next - movw d0,sr - rts diff --git a/sys/arch/solbourne/solbourne/locore.s b/sys/arch/solbourne/solbourne/locore.s index c9cce60f6e6..a19692545df 100644 --- a/sys/arch/solbourne/solbourne/locore.s +++ b/sys/arch/solbourne/solbourne/locore.s @@ -1,4 +1,4 @@ -/* $OpenBSD: locore.s,v 1.3 2005/11/15 07:02:36 miod Exp $ */ +/* $OpenBSD: locore.s,v 1.4 2006/02/22 22:16:07 miod Exp $ */ /* OpenBSD: locore.s,v 1.64 2005/04/17 18:47:50 miod Exp */ /* @@ -3793,31 +3793,6 @@ ENTRY(probeset) st %g0, [%o3 + PCB_ONFAULT] /* - * Insert entry into doubly-linked queue. - * We could just do this in C, but gcc does not do leaves well (yet). - */ -ENTRY(_insque) - ! %o0 = e = what to insert; %o1 = after = entry to insert after - st %o1, [%o0 + 4] ! e->prev = after; - ld [%o1], %o2 ! tmp = after->next; - st %o2, [%o0] ! e->next = tmp; - st %o0, [%o1] ! after->next = e; - retl - st %o0, [%o2 + 4] ! tmp->prev = e; - - -/* - * Remove entry from doubly-linked queue. - */ -ENTRY(_remque) - ! %o0 = e = what to remove - ld [%o0], %o1 ! n = e->next; - ld [%o0 + 4], %o2 ! p = e->prev; - st %o2, [%o1 + 4] ! n->prev = p; - retl - st %o1, [%o2] ! p->next = n; - -/* * copywords(src, dst, nbytes) * * Copy `nbytes' bytes from src to dst, both of which are word-aligned; diff --git a/sys/arch/sparc/sparc/locore.s b/sys/arch/sparc/sparc/locore.s index 7cf67858b55..35a46a0e192 100644 --- a/sys/arch/sparc/sparc/locore.s +++ b/sys/arch/sparc/sparc/locore.s @@ -1,4 +1,4 @@ -/* $OpenBSD: locore.s,v 1.66 2005/11/15 07:02:36 miod Exp $ */ +/* $OpenBSD: locore.s,v 1.67 2006/02/22 22:16:07 miod Exp $ */ /* $NetBSD: locore.s,v 1.73 1997/09/13 20:36:48 pk Exp $ */ /* @@ -4919,31 +4919,6 @@ ENTRY(xldcontrolb) st %g0, [%o2 + PCB_ONFAULT] /* - * Insert entry into doubly-linked queue. - * We could just do this in C, but gcc does not do leaves well (yet). - */ -ENTRY(_insque) - ! %o0 = e = what to insert; %o1 = after = entry to insert after - st %o1, [%o0 + 4] ! e->prev = after; - ld [%o1], %o2 ! tmp = after->next; - st %o2, [%o0] ! e->next = tmp; - st %o0, [%o1] ! after->next = e; - retl - st %o0, [%o2 + 4] ! tmp->prev = e; - - -/* - * Remove entry from doubly-linked queue. - */ -ENTRY(_remque) - ! %o0 = e = what to remove - ld [%o0], %o1 ! n = e->next; - ld [%o0 + 4], %o2 ! p = e->prev; - st %o2, [%o1 + 4] ! n->prev = p; - retl - st %o1, [%o2] ! p->next = n; - -/* * copywords(src, dst, nbytes) * * Copy `nbytes' bytes from src to dst, both of which are word-aligned; diff --git a/sys/arch/vax/include/macros.h b/sys/arch/vax/include/macros.h index 423c509d0c2..e71442917de 100644 --- a/sys/arch/vax/include/macros.h +++ b/sys/arch/vax/include/macros.h @@ -1,4 +1,4 @@ -/* $OpenBSD: macros.h,v 1.12 2003/08/01 02:23:45 avsm Exp $ */ +/* $OpenBSD: macros.h,v 1.13 2006/02/22 22:16:07 miod Exp $ */ /* $NetBSD: macros.h,v 1.20 2000/07/19 01:02:52 matt Exp $ */ /* @@ -52,24 +52,6 @@ ffs(int reg) return val; } -static __inline__ void -_remque(void *p) -{ - __asm__ __volatile ("remque (%0),%0;clrl 4(%0)" - : - : "r" (p) - : "memory" ); -} - -static __inline__ void -_insque(void *p, void *q) -{ - __asm__ __volatile ("insque (%0), (%1)" - : - : "r" (p),"r" (q) - : "memory" ); -} - static __inline__ void * memcpy(void *toe, const void *from, size_t len) { diff --git a/sys/sys/systm.h b/sys/sys/systm.h index ece8e8e2004..af78933bc65 100644 --- a/sys/sys/systm.h +++ b/sys/sys/systm.h @@ -1,4 +1,4 @@ -/* $OpenBSD: systm.h,v 1.67 2005/12/14 21:46:31 millert Exp $ */ +/* $OpenBSD: systm.h,v 1.68 2006/02/22 22:16:08 miod Exp $ */ /* $NetBSD: systm.h,v 1.50 1996/06/09 04:55:09 briggs Exp $ */ /*- @@ -129,13 +129,6 @@ extern int boothowto; /* reboot flags, from console subsystem */ extern void (*v_putc)(int); /* Virtual console putc routine */ -extern void _insque(void *, void *); -extern void _remque(void *); - -/* casts to keep lint happy, but it should be happy with void * */ -#define insque(q,p) _insque(q, p) -#define remque(q) _remque(q) - /* * General function declarations. */ |