[vmkit-commits] [vmkit] r197892 - correct two bugs

[Gael Thomas]

Author: gthomas
Date: Sun Dec 22 15:17:59 2013
New Revision: 197892

URL: http://llvm.org/viewvc/llvm-project?rev=197892&view=rev
Log:
correct two bugs

Modified:
    vmkit/branches/mcjit/lib/j3/vm/j3codegen.cc
    vmkit/branches/mcjit/lib/j3/vm/j3options.cc
    vmkit/branches/mcjit/lib/vmkit/allocator.cc

Modified: vmkit/branches/mcjit/lib/j3/vm/j3codegen.cc
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/mcjit/lib/j3/vm/j3codegen.cc?rev=197892&r1=197891&r2=197892&view=diff
==============================================================================
--- vmkit/branches/mcjit/lib/j3/vm/j3codegen.cc (original)
+++ vmkit/branches/mcjit/lib/j3/vm/j3codegen.cc Sun Dec 22 15:17:59 2013
@@ -883,15 +883,15 @@ void J3CodeGen::translate() {
 				break;
 
 			case J3Cst::BC_baload:                        /* 0x33 */
-				arrayStore(vm->typeByte);
+				arrayLoad(vm->typeByte);
 				break;
 
 			case J3Cst::BC_caload:                        /* 0x34 */
-				arrayStore(vm->typeChar);
+				arrayLoad(vm->typeChar);
 				break;
 
 			case J3Cst::BC_saload:                        /* 0x35 */
-				arrayStore(vm->typeShort);
+				arrayLoad(vm->typeShort);
 				break;
 
 			case J3Cst::BC_istore:                        /* 0x36 wide */

Modified: vmkit/branches/mcjit/lib/j3/vm/j3options.cc
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/mcjit/lib/j3/vm/j3options.cc?rev=197892&r1=197891&r2=197892&view=diff
==============================================================================
--- vmkit/branches/mcjit/lib/j3/vm/j3options.cc (original)
+++ vmkit/branches/mcjit/lib/j3/vm/j3options.cc Sun Dec 22 15:17:59 2013
@@ -19,7 +19,7 @@ J3Options::J3Options() {
 	debugLoad = 0;
 	debugResolve = 0;
 	debugIniting = 0;
-	debugTranslate = 1;
+	debugTranslate = 0;
 	debugLinking = 0;
 
 	genDebugExecute = debugExecute ? 1 : 0;

Modified: vmkit/branches/mcjit/lib/vmkit/allocator.cc
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/mcjit/lib/vmkit/allocator.cc?rev=197892&r1=197891&r2=197892&view=diff
==============================================================================
--- vmkit/branches/mcjit/lib/vmkit/allocator.cc (original)
+++ vmkit/branches/mcjit/lib/vmkit/allocator.cc Sun Dec 22 15:17:59 2013
@@ -27,6 +27,7 @@ BumpAllocator::~BumpAllocator() {
 	while(current->next) {
 		BumpAllocatorNode* tmp = current->next;
 		unmap(current, (uintptr_t)current->top - (uintptr_t)current);
+		current = tmp;
 	}
 }