[src/trunk]: src/sys/arch/amd64/include Correct offset calculation for ci

[cherry <cherry%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/5e41ddd4a121
branches:  trunk
changeset: 768167:5e41ddd4a121
user:      cherry <cherry%NetBSD.org@localhost>
date:      Wed Aug 10 06:33:13 2011 +0000

description:
Correct offset calculation for ci

diffstat:

 sys/arch/amd64/include/frameasm.h |  16 +++++++---------
 1 files changed, 7 insertions(+), 9 deletions(-)

diffs (31 lines):

diff -r 203bc27e8cce -r 5e41ddd4a121 sys/arch/amd64/include/frameasm.h
--- a/sys/arch/amd64/include/frameasm.h Wed Aug 10 06:30:59 2011 +0000
+++ b/sys/arch/amd64/include/frameasm.h Wed Aug 10 06:33:13 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: frameasm.h,v 1.15 2011/01/12 23:12:11 joerg Exp $      */
+/*     $NetBSD: frameasm.h,v 1.16 2011/08/10 06:33:13 cherry Exp $     */
 
 #ifndef _AMD64_MACHINE_FRAMEASM_H
 #define _AMD64_MACHINE_FRAMEASM_H
@@ -132,15 +132,13 @@
 
 #ifdef XEN
 #define CLI(temp_reg) \
-       movl CPUVAR(CPUID),%e ## temp_reg ;                     \
-       shlq $6,%r ## temp_reg ;                                \
-       addq CPUVAR(VCPU),%r ## temp_reg ;                      \
-       movb $1,EVTCHN_UPCALL_MASK(%r ## temp_reg)
+       movq CPUVAR(VCPU),%r ## temp_reg ;                      \
+       movb $1,EVTCHN_UPCALL_MASK(%r ## temp_reg);
+
 #define STI(temp_reg) \
-       movl CPUVAR(CPUID),%e ## temp_reg ;                     \
-       shlq $6,%r ## temp_reg ;                                \
-       addq CPUVAR(VCPU),%r ## temp_reg ;                      \
-       movb $0,EVTCHN_UPCALL_MASK(%r ## temp_reg)
+       movq CPUVAR(VCPU),%r ## temp_reg ;                      \
+       movb $0,EVTCHN_UPCALL_MASK(%r ## temp_reg);
+
 #else /* XEN */
 #define CLI(temp_reg) cli
 #define STI(temp_reg) sti