Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 3 Jul 2007 22:37:44 GMT
From:      Peter Wemm <peter@FreeBSD.org>
To:        Perforce Change Reviews <perforce@freebsd.org>
Subject:   PERFORCE change 122810 for review
Message-ID:  <200707032237.l63Mbiqr034609@repoman.freebsd.org>

next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=122810

Change 122810 by peter@peter_daintree on 2007/07/03 22:37:30

	Oops.  i386 uses both SYSCALL() and RSYSCALL(), unlike amd64 which just
	uses RSYSCALL.

Affected files ...

.. //depot/projects/hammer/lib/libc/i386/SYS.h#5 edit

Differences ...

==== //depot/projects/hammer/lib/libc/i386/SYS.h#5 (text+ko) ====

@@ -36,15 +36,16 @@
 #include <sys/syscall.h>
 #include <machine/asm.h>
 
-#define	RSYSCALL(x)	2: PIC_PROLOGUE; jmp PIC_PLT(HIDENAME(cerror));	\
+#define	SYSCALL(x)	2: PIC_PROLOGUE; jmp PIC_PLT(HIDENAME(cerror));	\
 			ENTRY(__CONCAT(__sys_,x));			\
 			.weak CNAME(x);					\
 			.set CNAME(x),CNAME(__CONCAT(__sys_,x));	\
 			.weak CNAME(__CONCAT(_,x));			\
 			.set CNAME(__CONCAT(_,x)),CNAME(__CONCAT(__sys_,x)); \
-			mov __CONCAT($SYS_,x),%eax; KERNCALL; jb 2b; ret
+			mov __CONCAT($SYS_,x),%eax; KERNCALL; jb 2b
+#define RSYSCALL(x)	SYSCALL(x); ret
 
-#define	PSEUDO(x)	2: PIC_PROLOGUE; jmp mp PIC_PLT(HIDENAME(cerror)); \
+#define	PSEUDO(x)	2: PIC_PROLOGUE; jmp PIC_PLT(HIDENAME(cerror)); \
 			ENTRY(__CONCAT(__sys_,x));			\
 			.weak CNAME(__CONCAT(_,x));			\
 			.set CNAME(__CONCAT(_,x)),CNAME(__CONCAT(__sys_,x)); \



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200707032237.l63Mbiqr034609>