Module Name: src
Committed By: jmcneill
Date: Thu Oct 20 20:13:55 UTC 2011
Modified Files:
src/sys/arch/x86/x86: vmt.c
src/sys/modules/vmt: Makefile
Log Message:
mark vm_reg members as volatile instead of building this with -O0
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/x86/x86/vmt.c
cvs rdiff -u -r1.1 -r1.2 src/sys/modules/vmt/Makefile
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/x86/x86/vmt.c
diff -u src/sys/arch/x86/x86/vmt.c:1.5 src/sys/arch/x86/x86/vmt.c:1.6
--- src/sys/arch/x86/x86/vmt.c:1.5 Tue Oct 18 21:41:25 2011
+++ src/sys/arch/x86/x86/vmt.c Thu Oct 20 20:13:55 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: vmt.c,v 1.5 2011/10/18 21:41:25 jmcneill Exp $ */
+/* $NetBSD: vmt.c,v 1.6 2011/10/20 20:13:55 jmcneill Exp $ */
/* $OpenBSD: vmt.c,v 1.11 2011/01/27 21:29:25 dtucker Exp $ */
/*
@@ -151,14 +151,15 @@ union vm_reg {
} __packed;
/* A register frame. */
+/* XXX 'volatile' as a workaround because BACKDOOR_OP is likely broken */
struct vm_backdoor {
- union vm_reg eax;
- union vm_reg ebx;
- union vm_reg ecx;
- union vm_reg edx;
- union vm_reg esi;
- union vm_reg edi;
- union vm_reg ebp;
+ volatile union vm_reg eax;
+ volatile union vm_reg ebx;
+ volatile union vm_reg ecx;
+ volatile union vm_reg edx;
+ volatile union vm_reg esi;
+ volatile union vm_reg edi;
+ volatile union vm_reg ebp;
} __packed;
/* RPC context. */
Index: src/sys/modules/vmt/Makefile
diff -u src/sys/modules/vmt/Makefile:1.1 src/sys/modules/vmt/Makefile:1.2
--- src/sys/modules/vmt/Makefile:1.1 Mon Oct 17 22:39:23 2011
+++ src/sys/modules/vmt/Makefile Thu Oct 20 20:13:54 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2011/10/17 22:39:23 jmcneill Exp $
+# $NetBSD: Makefile,v 1.2 2011/10/20 20:13:54 jmcneill Exp $
.include "../Makefile.inc"
@@ -7,7 +7,6 @@
KMOD= vmt
IOCONF= vmt.ioconf
SRCS= vmt.c
-COPTS.vmt.c= -O0
WARNS= 4
