Mercurial > jdk8-mips64-public > hotspot / changeset

     1.1 --- a/src/cpu/zero/vm/entry_zero.hpp	Mon Dec 18 18:18:10 2017 -0500
     1.2 +++ b/src/cpu/zero/vm/entry_zero.hpp	Wed Feb 28 05:31:04 2018 +0000
     1.3 @@ -1,5 +1,5 @@
     1.4  /*
     1.5 - * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
     1.6 + * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
     1.7   * Copyright 2008, 2009, 2010 Red Hat, Inc.
     1.8   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     1.9   *
    1.10 @@ -26,6 +26,8 @@
    1.11  #ifndef CPU_ZERO_VM_ENTRY_ZERO_HPP
    1.12  #define CPU_ZERO_VM_ENTRY_ZERO_HPP
    1.13  
    1.14 +#include "interpreter/cppInterpreter.hpp"
    1.15 +
    1.16  class ZeroEntry {
    1.17   public:
    1.18    ZeroEntry() {

     2.1 --- a/src/cpu/zero/vm/nativeInst_zero.cpp	Mon Dec 18 18:18:10 2017 -0500
     2.2 +++ b/src/cpu/zero/vm/nativeInst_zero.cpp	Wed Feb 28 05:31:04 2018 +0000
     2.3 @@ -1,5 +1,5 @@
     2.4  /*
     2.5 - * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
     2.6 + * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
     2.7   * Copyright 2008 Red Hat, Inc.
     2.8   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     2.9   *
    2.10 @@ -25,6 +25,8 @@
    2.11  
    2.12  #include "precompiled.hpp"
    2.13  #include "assembler_zero.inline.hpp"
    2.14 +#include "entry_zero.hpp"
    2.15 +#include "interpreter/cppInterpreter.hpp"
    2.16  #include "memory/resourceArea.hpp"
    2.17  #include "nativeInst_zero.hpp"
    2.18  #include "oops/oop.inline.hpp"

     3.1 --- a/src/share/vm/code/codeCache.cpp	Mon Dec 18 18:18:10 2017 -0500
     3.2 +++ b/src/share/vm/code/codeCache.cpp	Wed Feb 28 05:31:04 2018 +0000
     3.3 @@ -1,5 +1,5 @@
     3.4  /*
     3.5 - * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
     3.6 + * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
     3.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     3.8   *
     3.9   * This code is free software; you can redistribute it and/or modify it
    3.10 @@ -41,6 +41,7 @@
    3.11  #include "oops/oop.inline.hpp"
    3.12  #include "runtime/handles.inline.hpp"
    3.13  #include "runtime/arguments.hpp"
    3.14 +#include "runtime/deoptimization.hpp"
    3.15  #include "runtime/icache.hpp"
    3.16  #include "runtime/java.hpp"
    3.17  #include "runtime/mutexLocker.hpp"

     4.1 --- a/src/share/vm/interpreter/cppInterpreterGenerator.hpp	Mon Dec 18 18:18:10 2017 -0500
     4.2 +++ b/src/share/vm/interpreter/cppInterpreterGenerator.hpp	Wed Feb 28 05:31:04 2018 +0000
     4.3 @@ -1,5 +1,5 @@
     4.4  /*
     4.5 - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
     4.6 + * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
     4.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     4.8   *
     4.9   * This code is free software; you can redistribute it and/or modify it
    4.10 @@ -29,6 +29,9 @@
    4.11  // of the template interpreter generator.
    4.12  
    4.13  #ifdef CC_INTERP
    4.14 +#ifdef TARGET_ARCH_zero
    4.15 +# include "entry_zero.hpp"
    4.16 +#endif
    4.17  
    4.18  class CppInterpreterGenerator: public AbstractInterpreterGenerator {
    4.19    protected:

     5.1 --- a/src/share/vm/interpreter/interpreter.hpp	Mon Dec 18 18:18:10 2017 -0500
     5.2 +++ b/src/share/vm/interpreter/interpreter.hpp	Wed Feb 28 05:31:04 2018 +0000
     5.3 @@ -1,5 +1,5 @@
     5.4  /*
     5.5 - * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
     5.6 + * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
     5.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     5.8   *
     5.9   * This code is free software; you can redistribute it and/or modify it
    5.10 @@ -28,11 +28,9 @@
    5.11  #include "code/stubs.hpp"
    5.12  #include "interpreter/cppInterpreter.hpp"
    5.13  #include "interpreter/templateInterpreter.hpp"
    5.14 -#ifdef ZERO
    5.15  #ifdef TARGET_ARCH_zero
    5.16  # include "entry_zero.hpp"
    5.17  #endif
    5.18 -#endif
    5.19  
    5.20  // This file contains the platform-independent parts
    5.21  // of the interpreter and the interpreter generator.

     6.1 --- a/src/share/vm/runtime/frame.hpp	Mon Dec 18 18:18:10 2017 -0500
     6.2 +++ b/src/share/vm/runtime/frame.hpp	Wed Feb 28 05:31:04 2018 +0000
     6.3 @@ -1,5 +1,5 @@
     6.4  /*
     6.5 - * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
     6.6 + * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
     6.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     6.8   *
     6.9   * This code is free software; you can redistribute it and/or modify it
    6.10 @@ -45,11 +45,9 @@
    6.11  # include "adfiles/adGlobals_ppc_64.hpp"
    6.12  #endif
    6.13  #endif // COMPILER2
    6.14 -#ifdef ZERO
    6.15  #ifdef TARGET_ARCH_zero
    6.16  # include "stack_zero.hpp"
    6.17  #endif
    6.18 -#endif
    6.19  
    6.20  typedef class BytecodeInterpreter* interpreterState;
    6.21  

     7.1 --- a/src/share/vm/runtime/frame.inline.hpp	Mon Dec 18 18:18:10 2017 -0500
     7.2 +++ b/src/share/vm/runtime/frame.inline.hpp	Wed Feb 28 05:31:04 2018 +0000
     7.3 @@ -1,5 +1,5 @@
     7.4  /*
     7.5 - * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
     7.6 + * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
     7.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     7.8   *
     7.9   * This code is free software; you can redistribute it and/or modify it
    7.10 @@ -46,14 +46,12 @@
    7.11  #ifdef TARGET_ARCH_ppc
    7.12  # include "jniTypes_ppc.hpp"
    7.13  #endif
    7.14 -#ifdef ZERO
    7.15  #ifdef TARGET_ARCH_zero
    7.16  # include "entryFrame_zero.hpp"
    7.17  # include "fakeStubFrame_zero.hpp"
    7.18  # include "interpreterFrame_zero.hpp"
    7.19  # include "sharkFrame_zero.hpp"
    7.20  #endif
    7.21 -#endif
    7.22  
    7.23  // This file holds platform-independent bodies of inline functions for frames.
    7.24  

     8.1 --- a/src/share/vm/runtime/thread.hpp	Mon Dec 18 18:18:10 2017 -0500
     8.2 +++ b/src/share/vm/runtime/thread.hpp	Wed Feb 28 05:31:04 2018 +0000
     8.3 @@ -51,11 +51,9 @@
     8.4  #include "gc_implementation/g1/dirtyCardQueue.hpp"
     8.5  #include "gc_implementation/g1/satbQueue.hpp"
     8.6  #endif // INCLUDE_ALL_GCS
     8.7 -#ifdef ZERO
     8.8  #ifdef TARGET_ARCH_zero
     8.9  # include "stack_zero.hpp"
    8.10  #endif
    8.11 -#endif
    8.12  
    8.13  class ThreadSafepointState;
    8.14  class ThreadProfiler;