Module Name: src
Committed By: maxv
Date: Wed Jun 14 17:09:00 UTC 2017
Modified Files:
src/sys/arch/i386/include: frameasm.h
Log Message:
style
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/i386/include/frameasm.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/i386/include/frameasm.h
diff -u src/sys/arch/i386/include/frameasm.h:1.15 src/sys/arch/i386/include/frameasm.h:1.16
--- src/sys/arch/i386/include/frameasm.h:1.15 Tue Jul 26 12:57:35 2011
+++ src/sys/arch/i386/include/frameasm.h Wed Jun 14 17:09:00 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: frameasm.h,v 1.15 2011/07/26 12:57:35 yamt Exp $ */
+/* $NetBSD: frameasm.h,v 1.16 2017/06/14 17:09:00 maxv Exp $ */
#ifndef _I386_FRAMEASM_H_
#define _I386_FRAMEASM_H_
@@ -9,22 +9,22 @@
#endif
#if !defined(XEN)
-#define CLI(reg) cli
-#define STI(reg) sti
+#define CLI(reg) cli
+#define STI(reg) sti
#else
/* XXX assym.h */
-#define TRAP_INSTR int $0x82
-#define XEN_BLOCK_EVENTS(reg) movb $1,EVTCHN_UPCALL_MASK(reg)
-#define XEN_UNBLOCK_EVENTS(reg) movb $0,EVTCHN_UPCALL_MASK(reg)
-#define XEN_TEST_PENDING(reg) testb $0xFF,EVTCHN_UPCALL_PENDING(reg)
-
-#define CLI(reg) movl CPUVAR(VCPU),reg ; \
- XEN_BLOCK_EVENTS(reg)
-#define STI(reg) movl CPUVAR(VCPU),reg ; \
+#define TRAP_INSTR int $0x82
+#define XEN_BLOCK_EVENTS(reg) movb $1,EVTCHN_UPCALL_MASK(reg)
+#define XEN_UNBLOCK_EVENTS(reg) movb $0,EVTCHN_UPCALL_MASK(reg)
+#define XEN_TEST_PENDING(reg) testb $0xFF,EVTCHN_UPCALL_PENDING(reg)
+
+#define CLI(reg) movl CPUVAR(VCPU),reg ; \
+ XEN_BLOCK_EVENTS(reg)
+#define STI(reg) movl CPUVAR(VCPU),reg ; \
XEN_UNBLOCK_EVENTS(reg)
-#define STIC(reg) movl CPUVAR(VCPU),reg ; \
+#define STIC(reg) movl CPUVAR(VCPU),reg ; \
XEN_UNBLOCK_EVENTS(reg) ; \
- testb $0xff,EVTCHN_UPCALL_PENDING(reg)
+ testb $0xff,EVTCHN_UPCALL_PENDING(reg)
#endif
#ifndef TRAPLOG
@@ -60,7 +60,7 @@
rdmsr ; \
movl %eax,TREC_IBT(%ebx)
#endif
-
+
/*
* These are used on interrupt or trap entry or exit.
*/
