From: kaf24@localhost.localdomain <kaf24@localhost.localdomain>
Date: Sat, 13 Jan 2007 21:36:31 +0000 (+0000)
Subject: [TESTS] Fix native jump to 1MB absolute address in emulator test.
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~15405^2~7
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=ab5c6b8f111c738c8c1402a7dd46a5a612938b2b;p=xen.git

[TESTS] Fix native jump to 1MB absolute address in emulator test.
Fix typo in emulator comment.
Signed-off-by: Keir Fraser <keir@xensource.com>
---

diff --git a/tools/tests/test_x86_emulator.c b/tools/tests/test_x86_emulator.c
index b1c39d370a..a59bc467e2 100644
--- a/tools/tests/test_x86_emulator.c
+++ b/tools/tests/test_x86_emulator.c
@@ -511,7 +511,7 @@ int main(int argc, char **argv)
 #ifndef __x86_64__
     printf("%-40s", "Testing blowfish native execution...");    
     asm volatile (
-        "call 0x100000"
+        "movl $0x100000,%%ecx; call *%%ecx"
         : "=a" (regs.eax), "=d" (regs.edx)
         : "0" (2), "1" (1) : "ecx" );
     if ( (regs.eax != 2) || (regs.edx != 1) )
diff --git a/xen/arch/x86/x86_emulate.c b/xen/arch/x86/x86_emulate.c
index 200b6c4aac..1cdf67248a 100644
--- a/xen/arch/x86/x86_emulate.c
+++ b/xen/arch/x86/x86_emulate.c
@@ -853,7 +853,7 @@ x86_emulate(
         {
             /*
              * EA       += BitOffset DIV op_bytes*8
-             * BitOffset = BitOffset MOD op_byte*8
+             * BitOffset = BitOffset MOD op_bytes*8
              * DIV truncates towards negative infinity.
              * MOD always produces a positive result.
              */