diff options
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/pc532/include/asm.h | 10 | ||||
| -rw-r--r-- | sys/arch/pc532/pc532/bcopy.s | 12 | ||||
| -rw-r--r-- | sys/arch/pc532/pc532/bzero.s | 10 |
3 files changed, 10 insertions, 22 deletions
diff --git a/sys/arch/pc532/include/asm.h b/sys/arch/pc532/include/asm.h index fbb3a42206a..f5b55b12f9e 100644 --- a/sys/arch/pc532/include/asm.h +++ b/sys/arch/pc532/include/asm.h @@ -1,4 +1,4 @@ -/* $NetBSD: asm.h,v 1.5 1994/10/26 08:24:22 cgd Exp $ */ +/* $NetBSD: asm.h,v 1.6 1996/01/26 08:10:10 phil Exp $ */ /* * Mach Operating System @@ -52,14 +52,6 @@ #define FRAME enter [],0 #define EMARF exit [] -#if 1 /* DEBUG */ -#define DFRAME FRAME -#define DEMARF EMARF -#else -#define DFRAME -#define DEMARF -#endif - #define S_ARG0 4(sp) #define S_ARG1 8(sp) #define S_ARG2 12(sp) diff --git a/sys/arch/pc532/pc532/bcopy.s b/sys/arch/pc532/pc532/bcopy.s index 134743ae74e..eb463bf8a18 100644 --- a/sys/arch/pc532/pc532/bcopy.s +++ b/sys/arch/pc532/pc532/bcopy.s @@ -1,4 +1,4 @@ -/* $NetBSD: bcopy.s,v 1.5 1995/08/29 22:37:41 phil Exp $ */ +/* $NetBSD: bcopy.s,v 1.6 1996/01/26 08:11:46 phil Exp $ */ /* * Mach Operating System @@ -33,15 +33,13 @@ * Helsinki University of Technology 1992. */ -#include <machine/asm.h> - .text /* ovbcopy (from, to, bcount) -- does overlapping stuff */ ENTRY(bcopy) ENTRY(ovbcopy) - DFRAME + enter [],0 movd B_ARG0,r1 /* from */ movd B_ARG1,r2 /* to */ cmpd r2, r1 @@ -66,13 +64,13 @@ ENTRY(ovbcopy) movd B_ARG2, r0 lshd -2,r0 movsd b /* move words backwards */ - DEMARF + exit [] ret 0 /* bcopy(from, to, bcount) -- non overlapping */ /* ENTRY(bcopy) -- same as ovbcopy until furthur notice.... */ - DFRAME + enter [],0 movd B_ARG0,r1 /* from */ movd B_ARG1,r2 /* to */ common: movd B_ARG2,r0 /* bcount */ @@ -81,5 +79,5 @@ common: movd B_ARG2,r0 /* bcount */ movd B_ARG2,r0 andd 3,r0 movsb /* move bytes */ - DEMARF + exit [] ret 0 diff --git a/sys/arch/pc532/pc532/bzero.s b/sys/arch/pc532/pc532/bzero.s index 22a1e87efdd..3e242b44b8f 100644 --- a/sys/arch/pc532/pc532/bzero.s +++ b/sys/arch/pc532/pc532/bzero.s @@ -1,4 +1,4 @@ -/* $NetBSD: bzero.s,v 1.2 1994/10/26 08:24:51 cgd Exp $ */ +/* $NetBSD: bzero.s,v 1.3 1996/01/26 08:11:47 phil Exp $ */ /* * Mach Operating System @@ -31,19 +31,17 @@ * File: ns532/bzero.s * Author: Tero Kivinen, Helsinki University of Technology 1992. * - * $Id: bzero.s,v 1.1 1995/10/18 08:51:21 deraadt Exp $ + * $Id: bzero.s,v 1.2 1996/01/31 06:36:15 deraadt Exp $ */ -#include <machine/asm.h> /* * bzero(char * addr, unsigned int length) */ .text -Entry(blkclr) ENTRY(bzero) - DFRAME + enter [],0 movd B_ARG0,r1 /* addr */ movd B_ARG1,r2 /* length */ movd r1,r0 /* align addr */ @@ -95,5 +93,5 @@ bytes: movd r2,r0 /* length */ bloop: movqb 0,0(r1) /* zero bytes */ addqd 1,r1 acbb -1,r0,bloop -done: DEMARF +done: exit [] ret 0 |