Index: build/make/targets/reg.test.xml
===================================================================
--- build/make/targets/reg.test.xml (revision 584826)
+++ build/make/targets/reg.test.xml (working copy)
@@ -145,8 +145,9 @@
outfile="${reg.test.native.path}/${outfile}"
objdir="${objdir}">
-
-
+
Index: build/make/targets/reg.test.run.xml
===================================================================
--- build/make/targets/reg.test.run.xml (revision 584826)
+++ build/make/targets/reg.test.run.xml (working copy)
@@ -17,14 +17,17 @@
-
-
+
+
+
+
+
-
=====================================
Tested JVM: ${test.jvm.exe}
@@ -58,9 +61,8 @@
-
+
@@ -96,10 +98,51 @@
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -108,11 +151,14 @@
-
+
+
@@ -121,18 +167,11 @@
-
-
-
-
-
-
-
-
+
+
-
@@ -174,7 +213,7 @@
fork="yes"
timeout="${reg.test.timeout}">
-
+
@@ -194,17 +233,11 @@
msg="Exit code: ${@{test}.res.code}"
detail="Exit code: ${@{test}.res.code} Err: ${@{test}.msg}"/>
-
-
-
-
-
-
-
+
Index: build/make/targets/kernel.test.xml
===================================================================
--- build/make/targets/kernel.test.xml (revision 584826)
+++ build/make/targets/kernel.test.xml (working copy)
@@ -31,7 +31,6 @@
-
==================================
@@ -71,20 +70,8 @@
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
@@ -277,7 +282,6 @@
-
Index: build/make/targets/ehwa.test.xml
===================================================================
--- build/make/targets/ehwa.test.xml (revision 584826)
+++ build/make/targets/ehwa.test.xml (working copy)
@@ -17,22 +17,49 @@
-->
-
-
-
-
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
- Using Eclipse ${eclipseproduct.version} located at ${eclipse.home}
+
+ Using Eclipse located at ${eclipse.home}
@@ -47,7 +74,7 @@
-
+
@@ -57,22 +84,11 @@
Run Eclipse HelloWorld using ${ehwa.mode.name}
==================================
-
-
-
-
-
-
-
-
-
-
+
+
-
+
@@ -81,46 +97,35 @@
- ${ehwa.mode.name} ${ehwa.status} (Return code is ${ehwa.result})${line.separator}
-
+
-
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
+
+
@@ -131,7 +136,7 @@
-
+
@@ -142,31 +147,31 @@
-
-
+
+
-
-
-
+
+
+
-
+
Unhandled archive type: ${eclipse.zip}
-
+
Index: build/make/test.properties
===================================================================
--- build/make/test.properties (revision 584826)
+++ build/make/test.properties (working copy)
@@ -89,11 +89,11 @@
eclipse.mirror=http://www.mirrorservice.org/sites/download.eclipse.org/eclipseMirror/eclipse/downloads/drops/R-3.2.1-200609210945
eclipse-3.3.mirror=http://www.mirrorservice.org/sites/download.eclipse.org/eclipseMirror/eclipse/downloads/drops/R-3.3-200706251500
-eclipse.windows.x86.url=${eclipse.mirror}/eclipse-SDK-3.2.1-win32.zip
-#eclipse.windows.x86.url=${eclipse-3.3.mirror}/eclipse-SDK-3.3-win32.zip
-eclipse.windows.x86_64.url=${eclipse.mirror}/eclipse-SDK-3.2.1-win32-x86_64.zip
-#eclipse.windows.x86_64.url=${eclipse-3.3.mirror}/eclipse-SDK-3.3-win32-x86_64.zip
-eclipse.windows.ia64.url=${eclipse.mirror}/eclipse-SDK-3.2.1-win32-ia64.zip
+eclipse.win.x86.url=${eclipse.mirror}/eclipse-SDK-3.2.1-win32.zip
+#eclipse.win.x86.url=${eclipse-3.3.mirror}/eclipse-SDK-3.3-win32.zip
+eclipse.win.x86_64.url=${eclipse.mirror}/eclipse-SDK-3.2.1-win32-x86_64.zip
+#eclipse.win.x86_64.url=${eclipse-3.3.mirror}/eclipse-SDK-3.3-win32-x86_64.zip
+eclipse.win.ia64.url=${eclipse.mirror}/eclipse-SDK-3.2.1-win32-ia64.zip
eclipse.linux.x86.url=${eclipse.mirror}/eclipse-SDK-3.2.1-linux-gtk.tar.gz
eclipse.linux.x86_64.url=${eclipse.mirror}/eclipse-SDK-3.2.1-linux-gtk-x86_64.tar.gz
eclipse.linux.ia64.url=${eclipse.mirror}/eclipse-SDK-3.2.1-linux-gtk-ia64.tar.gz
Index: build/make/build.xml
===================================================================
--- build/make/build.xml (revision 584826)
+++ build/make/build.xml (working copy)
@@ -242,8 +242,6 @@
-
-
@@ -302,7 +300,7 @@
-
-
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
@@ -465,37 +463,31 @@
-
-
-
-
-
-
Index: vm/vmcore/src/util/win/em64t/exception_handlers.asm
===================================================================
--- vm/vmcore/src/util/win/em64t/exception_handlers.asm (revision 584826)
+++ vm/vmcore/src/util/win/em64t/exception_handlers.asm (working copy)
@@ -4,12 +4,6 @@
PUBLIC asm_c_exception_handler
EXTRN c_exception_handler:PROC
-PUBLIC asm_exception_catch_callback
-EXTRN exception_catch_callback_wrapper:PROC
-
-PUBLIC asm_jvmti_exception_catch_callback
-EXTRN jvmti_exception_catch_callback_wrapper:PROC
-
_TEXT SEGMENT
vectored_exception_handler PROC
Index: vm/jitrino/src/codegenerator/ipf/include/IpfInstrumentator.h
===================================================================
--- vm/jitrino/src/codegenerator/ipf/include/IpfInstrumentator.h (revision 584826)
+++ vm/jitrino/src/codegenerator/ipf/include/IpfInstrumentator.h (working copy)
@@ -26,6 +26,7 @@
#include "IpfCfg.h"
#include "IpfOpndManager.h"
+#include "DrlVMInterface.h"
namespace Jitrino {
namespace IPF {
Index: vm/jitrino/src/codegenerator/ipf/IpfInstCodeSelector.cpp
===================================================================
--- vm/jitrino/src/codegenerator/ipf/IpfInstCodeSelector.cpp (revision 584826)
+++ vm/jitrino/src/codegenerator/ipf/IpfInstCodeSelector.cpp (working copy)
@@ -20,6 +20,7 @@
*
*/
+#include "DrlVMInterface.h"
#include "MemoryAttribute.h"
#include "IpfCodeSelector.h"
#include "IpfIrPrinter.h"
@@ -1381,7 +1382,7 @@
IPF_LOG << " throwSystemException" << endl;
- VM_RT_SUPPORT hId = VM_RT_UNKNOWN;
+ VM_RT_SUPPORT hId = CompilationInterface::Helper_Null;
switch (id) {
case CompilationInterface::Exception_NullPointer:
hId = VM_RT_NULL_PTR_EXCEPTION; break;
Index: vm/jitrino/src/codegenerator/ipf/IpfOpndManager.cpp
===================================================================
--- vm/jitrino/src/codegenerator/ipf/IpfOpndManager.cpp (revision 584826)
+++ vm/jitrino/src/codegenerator/ipf/IpfOpndManager.cpp (working copy)
@@ -22,6 +22,7 @@
#include "IpfCfg.h"
#include "IpfOpndManager.h"
+#include "DrlVMInterface.h"
#include "IpfIrPrinter.h"
namespace Jitrino {
Index: vm/jitrino/src/vm/JITInterface.cpp
===================================================================
--- vm/jitrino/src/vm/JITInterface.cpp (revision 584826)
+++ vm/jitrino/src/vm/JITInterface.cpp (working copy)
@@ -155,9 +155,7 @@
{
JITInstanceContext* jitContext = Jitrino::getJITInstanceContext(jit);
if (jitContext->isJet()) {
-#ifdef USE_FAST_PATH
Jet::rt_profile_notification_callback(jit, pc, mh);
-#endif
} //opt does not support counters patching today.
}
Index: src/test/regression/H3256/run.test.xml
===================================================================
--- src/test/regression/H3256/run.test.xml (revision 584826)
+++ src/test/regression/H3256/run.test.xml (working copy)
@@ -1,7 +0,0 @@
-
-
-
-
-
-
Index: src/test/regression/H3256/InterruptTimedWaitingTest.java
===================================================================
--- src/test/regression/H3256/InterruptTimedWaitingTest.java (revision 584826)
+++ src/test/regression/H3256/InterruptTimedWaitingTest.java (working copy)
@@ -1,90 +0,0 @@
-package org.apache.harmony.drlvm.tests.regression.h3256;
-
-public class InterruptTimedWaitingTest {
-
- Object lock = new Object();
- int threadCount = 100;
- int THREAD_WAIT_TIME = 10000;
- int WAIT_CONDITION_TIME = 2000;
- int SLEEP_TIME = 100;
- int loopCountBegin = WAIT_CONDITION_TIME / SLEEP_TIME;
- int loopCount;
- int waitedTime;
-
- class ThreadWaiting extends Thread {
- volatile boolean exceptionReceived = false;
- volatile boolean working = false;
-
- public void run () {
- synchronized (lock) {
- this.working = true;
- lock.notify();
- }
- synchronized (this) {
- try {
- this.wait(THREAD_WAIT_TIME);
- } catch (InterruptedException e) {
- exceptionReceived = true;
- }
- }
- }
- }
-
- public void testInterrupt_Waiting() {
- for (int i = 0; i < threadCount; i++) {
- ThreadWaiting t = new ThreadWaiting();
- try {
- synchronized (lock) {
- t.start();
- while (!t.working) {
- lock.wait();
- }
- }
- } catch (InterruptedException e) {
- e.printStackTrace();
- }
-
- // wait for Thread.State.TIMED_WAITING
- Thread.State ts = t.getState();
- loopCount = loopCountBegin;
- while ((ts != Thread.State.TIMED_WAITING) && (loopCount-- > 0)) {
- ts = t.getState();
- try {
- Thread.sleep(SLEEP_TIME);
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
-
- // interrupt the thread
- t.interrupt();
-
- // wait for InteruptedException
- loopCount = loopCountBegin;
- while (!t.exceptionReceived && (loopCount-- > 0)) {
- try {
- Thread.sleep(SLEEP_TIME);
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
- waitedTime = (loopCountBegin - loopCount) * SLEEP_TIME;
- System.out.println(i + " exception waited for " + waitedTime + " ms");
-
- // check for exception received
- if (loopCount < 0) {
- System.out.println(i + " FAILED: waiting thread has not received the InterruptedException");
- System.exit(-1);
- }
- // check for interrupted status cleared
- if (t.isInterrupted()) {
- System.out.println(i + " FAILED: interrupt status has not been cleared");
- System.exit(-2);
- }
- }
- }
-
- public static void main(String args[]) {
- new InterruptTimedWaitingTest().testInterrupt_Waiting();
- }
-}
\ No newline at end of file