Fridrich Strba 2018-09-18 10:30:00 +00:00 committed by Git OBS Bridge
parent d3a7ee154f
commit fc89baa6ff

View File

@ -1,102 +0,0 @@
--- icedtea-3.8.0/openjdk/hotspot/src/cpu/zero/vm/entry_zero.hpp 2018-09-18 09:18:59.322369639 +0200
+++ icedtea-3.8.0/openjdk/hotspot/src/cpu/zero/vm/entry_zero.hpp 2018-09-18 09:19:28.666529064 +0200
@@ -28,6 +28,8 @@
#include "interpreter/cppInterpreter.hpp"
+#include "interpreter/cppInterpreter.hpp"
+
class ZeroEntry {
public:
ZeroEntry() {
--- icedtea-3.8.0/openjdk/hotspot/src/cpu/zero/vm/nativeInst_zero.cpp 2018-09-18 09:18:59.322369639 +0200
+++ icedtea-3.8.0/openjdk/hotspot/src/cpu/zero/vm/nativeInst_zero.cpp 2018-09-18 09:20:49.778969734 +0200
@@ -26,6 +26,7 @@
#include "precompiled.hpp"
#include "assembler_zero.inline.hpp"
#include "entry_zero.hpp"
+#include "interpreter/cppInterpreter.hpp"
#include "memory/resourceArea.hpp"
#include "nativeInst_zero.hpp"
#include "oops/oop.inline.hpp"
--- icedtea-3.8.0/openjdk/hotspot/src/share/vm/code/codeCache.cpp 2018-09-18 09:18:59.346369770 +0200
+++ icedtea-3.8.0/openjdk/hotspot/src/share/vm/code/codeCache.cpp 2018-09-18 09:19:28.670529085 +0200
@@ -41,6 +41,7 @@
#include "oops/oop.inline.hpp"
#include "runtime/handles.inline.hpp"
#include "runtime/arguments.hpp"
+#include "runtime/deoptimization.hpp"
#include "runtime/icache.hpp"
#include "runtime/java.hpp"
#include "runtime/mutexLocker.hpp"
--- icedtea-3.8.0/openjdk/hotspot/src/share/vm/interpreter/cppInterpreterGenerator.hpp 2018-09-18 09:18:59.354369813 +0200
+++ icedtea-3.8.0/openjdk/hotspot/src/share/vm/interpreter/cppInterpreterGenerator.hpp 2018-09-18 09:19:28.670529085 +0200
@@ -34,6 +34,9 @@
#endif
#ifdef CC_INTERP
+#ifdef TARGET_ARCH_zero
+# include "entry_zero.hpp"
+#endif
class CppInterpreterGenerator: public AbstractInterpreterGenerator {
protected:
--- icedtea-3.8.0/openjdk/hotspot/src/share/vm/interpreter/interpreter.hpp 2018-09-18 09:18:59.354369813 +0200
+++ icedtea-3.8.0/openjdk/hotspot/src/share/vm/interpreter/interpreter.hpp 2018-09-18 09:19:28.670529085 +0200
@@ -28,11 +28,9 @@
#include "code/stubs.hpp"
#include "interpreter/cppInterpreter.hpp"
#include "interpreter/templateInterpreter.hpp"
-#ifdef ZERO
#ifdef TARGET_ARCH_zero
# include "entry_zero.hpp"
#endif
-#endif
// This file contains the platform-independent parts
// of the interpreter and the interpreter generator.
--- icedtea-3.8.0/openjdk/hotspot/src/share/vm/runtime/frame.hpp 2018-09-18 09:18:59.362369857 +0200
+++ icedtea-3.8.0/openjdk/hotspot/src/share/vm/runtime/frame.hpp 2018-09-18 09:19:28.670529085 +0200
@@ -47,11 +47,9 @@
# include "adfiles/adGlobals_ppc_64.hpp"
#endif
#endif // COMPILER2
-#ifdef ZERO
#ifdef TARGET_ARCH_zero
# include "stack_zero.hpp"
#endif
-#endif
typedef class BytecodeInterpreter* interpreterState;
--- icedtea-3.8.0/openjdk/hotspot/src/share/vm/runtime/frame.inline.hpp 2018-09-18 09:18:59.362369857 +0200
+++ icedtea-3.8.0/openjdk/hotspot/src/share/vm/runtime/frame.inline.hpp 2018-09-18 09:19:28.670529085 +0200
@@ -49,14 +49,12 @@
#ifdef TARGET_ARCH_ppc
# include "jniTypes_ppc.hpp"
#endif
-#ifdef ZERO
#ifdef TARGET_ARCH_zero
# include "entryFrame_zero.hpp"
# include "fakeStubFrame_zero.hpp"
# include "interpreterFrame_zero.hpp"
# include "sharkFrame_zero.hpp"
#endif
-#endif
// This file holds platform-independent bodies of inline functions for frames.
--- icedtea-3.8.0/openjdk/hotspot/src/share/vm/runtime/thread.hpp 2018-09-18 09:18:59.366369878 +0200
+++ icedtea-3.8.0/openjdk/hotspot/src/share/vm/runtime/thread.hpp 2018-09-18 09:19:28.670529085 +0200
@@ -51,11 +51,9 @@
#include "gc_implementation/g1/dirtyCardQueue.hpp"
#include "gc_implementation/g1/satbQueue.hpp"
#endif // INCLUDE_ALL_GCS
-#ifdef ZERO
#ifdef TARGET_ARCH_zero
# include "stack_zero.hpp"
#endif
-#endif
class ThreadSafepointState;
class ThreadProfiler;