commit ed974e9ea6220b363d2f093d1a2d4bf4b8f3c429
author Android (Google) Code Review <android-gerrit@google.com> Wed Sep 02 16:47:51 2009 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Wed Sep 02 16:47:51 2009 -0700
tree 69d2069d20b471db3dabb807b7a5c21a70bd21f4
parent 793f142323c49818ad022a05cbfb931eefddae5b
parent 18ca9f2f72023f7abd693509be9020a56b76df1f

Merge change 23724 into eclair

* changes:
  Fix x86 call bridge

vm/arch/x86/Call386ABI.S

diff --git a/vm/arch/x86/Call386ABI.S b/vm/arch/x86/Call386ABI.S
index 6cb680c..c98876c 100644
--- a/vm/arch/x86/Call386ABI.S
+++ b/vm/arch/x86/Call386ABI.S
@@ -145,7 +145,7 @@
     movl     %eax,(%ecx)
     jmp      cleanUpAndExit
 checkShort:
-    cmpl     $6,%eax  /* U2? */
+    cmpl     $6,%ebx  /* U2? */
     jne      isSignedShort
     movzwl   %ax,%eax
     movl     %eax,(%ecx)
@@ -153,6 +153,7 @@
 isSignedShort:
     /* Must be S2 */
     movswl   %ax,%eax
+    movl     %eax,(%ecx)
     jmp      cleanUpAndExit
 isFP:
     /* Is Float? */