You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by ml...@apache.org on 2006/12/22 10:26:42 UTC
svn commit: r489588 - in /harmony/enhanced:
classlib/trunk/modules/archive/make/exclude.linux.x86_64.drl
drlvm/trunk/vm/vmcore/src/util/em64t/base/ini_em64t.cpp
Author: mloenko
Date: Fri Dec 22 01:26:42 2006
New Revision: 489588
URL: http://svn.apache.org/viewvc?view=rev&rev=489588
Log:
applied patch for HARMONY-2834
[drlvm] ZipEntryTest failes due to incorrect args transition
Modified:
harmony/enhanced/classlib/trunk/modules/archive/make/exclude.linux.x86_64.drl
harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/em64t/base/ini_em64t.cpp
Modified: harmony/enhanced/classlib/trunk/modules/archive/make/exclude.linux.x86_64.drl
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/archive/make/exclude.linux.x86_64.drl?view=diff&rev=489588&r1=489587&r2=489588
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/archive/make/exclude.linux.x86_64.drl (original)
+++ harmony/enhanced/classlib/trunk/modules/archive/make/exclude.linux.x86_64.drl Fri Dec 22 01:26:42 2006
@@ -1 +0,0 @@
-org/apache/harmony/archive/tests/java/util/zip/ZipEntryTest.java
\ No newline at end of file
Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/em64t/base/ini_em64t.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/em64t/base/ini_em64t.cpp?view=diff&rev=489588&r1=489587&r2=489588
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/em64t/base/ini_em64t.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/em64t/base/ini_em64t.cpp Fri Dec 22 01:26:42 2006
@@ -104,7 +104,7 @@
labels.add_patch_to_label(MOVE_STACK_ARGS_END, stub - 1, LPT_Rel8);
// align stack if required (rsp % 16 == 0)
- stub = alu(stub, and_opc, rcx_opnd, Imm_Opnd(size_64, 1));
+ stub = test(stub, rcx_opnd, Imm_Opnd(size_32, 1));
stub = branch8(stub, Condition_Z, Imm_Opnd(size_8, 0));
labels.add_patch_to_label(COMPUTE_ADDRESS, stub - 1, LPT_Rel8);
stub = push(stub, rax_opnd);