Ignore:
Timestamp:
Feb 13, 2012, 10:07:12 PM (14 years ago)
Author:
dmik
Message:

trunk: Merged in openjdk6 b24 from branches/vendor/oracle.

Location:
trunk/openjdk
Files:
74 edited

Legend:

Unmodified
Added
Removed

  • trunk/openjdk

  • trunk/openjdk/hotspot/src/cpu/zero/vm/assembler_zero.cpp

    r278 r309  
    11/*
    2  * Copyright (c) 2003, 2007, Oracle and/or its affiliates. All rights reserved.
     2 * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
    33 * Copyright 2007, 2008, 2009 Red Hat, Inc.
    44 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    … …  
    2424 */
    2525
    26 #include "incls/_precompiled.incl"
    27 #include "incls/_assembler_zero.cpp.incl"
     26#include "precompiled.hpp"
     27#include "assembler_zero.inline.hpp"
     28#include "gc_interface/collectedHeap.inline.hpp"
     29#include "interpreter/interpreter.hpp"
     30#include "memory/cardTableModRefBS.hpp"
     31#include "memory/resourceArea.hpp"
     32#include "prims/methodHandles.hpp"
     33#include "runtime/biasedLocking.hpp"
     34#include "runtime/interfaceSupport.hpp"
     35#include "runtime/objectMonitor.hpp"
     36#include "runtime/os.hpp"
     37#include "runtime/sharedRuntime.hpp"
     38#include "runtime/stubRoutines.hpp"
     39#ifndef SERIALGC
     40#include "gc_implementation/g1/g1CollectedHeap.inline.hpp"
     41#include "gc_implementation/g1/g1SATBCardTableModRefBS.hpp"
     42#include "gc_implementation/g1/heapRegion.hpp"
     43#endif
    2844
    2945int AbstractAssembler::code_fill_byte() {

  • trunk/openjdk/hotspot/src/cpu/zero/vm/assembler_zero.hpp

    r278 r309  
    11/*
    2  * Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved.
     2 * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
    33 * Copyright 2007, 2008, 2009 Red Hat, Inc.
    44 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    … …  
    2323 *
    2424 */
     25
     26#ifndef CPU_ZERO_VM_ASSEMBLER_ZERO_HPP
     27#define CPU_ZERO_VM_ASSEMBLER_ZERO_HPP
    2528
    2629// In normal, CPU-specific ports of HotSpot these two classes are used
    … …  
    6366address ShouldNotCallThisStub();
    6467address ShouldNotCallThisEntry();
     68
     69#endif // CPU_ZERO_VM_ASSEMBLER_ZERO_HPP

  • trunk/openjdk/hotspot/src/cpu/zero/vm/assembler_zero.inline.hpp

    r278 r309  
    11/*
    2  * Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved.
     2 * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
    33 * Copyright 2009 Red Hat, Inc.
    44 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    … …  
    2424 */
    2525
     26#ifndef CPU_ZERO_VM_ASSEMBLER_ZERO_INLINE_HPP
     27#define CPU_ZERO_VM_ASSEMBLER_ZERO_INLINE_HPP
     28
     29#include "asm/assembler.inline.hpp"
     30#include "asm/codeBuffer.hpp"
     31#include "code/codeCache.hpp"
     32#include "runtime/handles.inline.hpp"
     33
    2634// This file is intentionally empty
     35
     36#endif // CPU_ZERO_VM_ASSEMBLER_ZERO_INLINE_HPP

  • trunk/openjdk/hotspot/src/cpu/zero/vm/bytecodeInterpreter_zero.cpp

    r278 r309  
    11/*
    2  * Copyright (c) 2003, 2007, Oracle and/or its affiliates. All rights reserved.
     2 * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
    33 * Copyright 2008 Red Hat, Inc.
    44 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    … …  
    2424 */
    2525
    26 #include "incls/_precompiled.incl"
    27 #include "incls/_cppInterpreter_zero.cpp.incl"
     26#include "precompiled.hpp"
     27#include "asm/assembler.hpp"
     28#include "interp_masm_zero.hpp"
     29#include "interpreter/bytecodeInterpreter.hpp"
     30#include "interpreter/bytecodeInterpreter.inline.hpp"
     31#include "interpreter/interpreter.hpp"
     32#include "interpreter/interpreterRuntime.hpp"
     33#include "oops/methodDataOop.hpp"
     34#include "oops/methodOop.hpp"
     35#include "oops/oop.inline.hpp"
     36#include "prims/jvmtiExport.hpp"
     37#include "prims/jvmtiThreadState.hpp"
     38#include "runtime/deoptimization.hpp"
     39#include "runtime/frame.inline.hpp"
     40#include "runtime/sharedRuntime.hpp"
     41#include "runtime/stubRoutines.hpp"
     42#include "runtime/synchronizer.hpp"
     43#include "runtime/vframeArray.hpp"
     44#include "utilities/debug.hpp"
    2845
    2946#ifdef CC_INTERP

  • trunk/openjdk/hotspot/src/cpu/zero/vm/bytecodeInterpreter_zero.hpp

    r278 r309  
    11/*
    2  * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
     2 * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
    33 * Copyright 2007, 2008 Red Hat, Inc.
    44 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    … …  
    2323 *
    2424 */
     25
     26#ifndef CPU_ZERO_VM_BYTECODEINTERPRETER_ZERO_HPP
     27#define CPU_ZERO_VM_BYTECODEINTERPRETER_ZERO_HPP
    2528
    2629// Platform specific for C++ based Interpreter
    … …  
    147150#define SET_LOCALS_LONG_FROM_ADDR(addr, offset) (((VMJavaVal64*)&locals[-((offset)+1)])->l = \
    148151                                                ((VMJavaVal64*)(addr))->l)
     152
     153#endif // CPU_ZERO_VM_BYTECODEINTERPRETER_ZERO_HPP

  • trunk/openjdk/hotspot/src/cpu/zero/vm/bytecodeInterpreter_zero.inline.hpp

    r278 r309  
    11/*
    2  * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
     2 * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
    33 * Copyright 2007, 2010 Red Hat, Inc.
    44 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    … …  
    2323 *
    2424 */
     25
     26#ifndef CPU_ZERO_VM_BYTECODEINTERPRETER_ZERO_INLINE_HPP
     27#define CPU_ZERO_VM_BYTECODEINTERPRETER_ZERO_INLINE_HPP
    2528
    2629// Inline interpreter functions for zero
    … …  
    300303  return (jbyte) val;
    301304}
     305
     306#endif // CPU_ZERO_VM_BYTECODEINTERPRETER_ZERO_INLINE_HPP

  • trunk/openjdk/hotspot/src/cpu/zero/vm/bytecodes_zero.cpp

    r278 r309  
    11/*
    2  * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
     2 * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
    33 * Copyright 2007 Red Hat, Inc.
    44 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    … …  
    2424 */
    2525
    26 #include "incls/_precompiled.incl"
    27 #include "incls/_bytecodes_zero.cpp.incl"
     26#include "precompiled.hpp"
     27#include "interpreter/bytecodes.hpp"
    2828
    2929void Bytecodes::pd_initialize() {

  • trunk/openjdk/hotspot/src/cpu/zero/vm/bytecodes_zero.hpp

    r278 r309  
    11/*
    2  * Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved.
     2 * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
    33 * Copyright 2009 Red Hat, Inc.
    44 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    … …  
    2424 */
    2525
     26#ifndef CPU_ZERO_VM_BYTECODES_ZERO_HPP
     27#define CPU_ZERO_VM_BYTECODES_ZERO_HPP
     28
    2629// This file is intentionally empty
     30
     31#endif // CPU_ZERO_VM_BYTECODES_ZERO_HPP

  • trunk/openjdk/hotspot/src/cpu/zero/vm/bytes_zero.hpp

    r278 r309  
    11/*
    2  * Copyright (c) 1997, 2002, Oracle and/or its affiliates. All rights reserved.
     2 * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
    33 * Copyright 2007, 2008, 2009 Red Hat, Inc.
    44 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    … …  
    2323 *
    2424 */
     25
     26#ifndef CPU_ZERO_VM_BYTES_ZERO_HPP
     27#define CPU_ZERO_VM_BYTES_ZERO_HPP
     28
     29#include "memory/allocation.hpp"
    2530
    2631typedef union unaligned {
    … …  
    161166// The following header contains the implementations of swap_u2,
    162167// swap_u4, and swap_u8
    163 #include "incls/_bytes_pd.inline.hpp.incl"
     168#ifdef TARGET_OS_ARCH_linux_zero
     169# include "bytes_linux_zero.inline.hpp"
     170#endif
     171
    164172#endif // VM_LITTLE_ENDIAN
     173
     174#endif // CPU_ZERO_VM_BYTES_ZERO_HPP

  • trunk/openjdk/hotspot/src/cpu/zero/vm/codeBuffer_zero.hpp

    r278 r309  
    11/*
    2  * Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved.
     2 * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
    33 * Copyright 2007 Red Hat, Inc.
    44 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    … …  
    2424 */
    2525
     26#ifndef CPU_ZERO_VM_CODEBUFFER_ZERO_HPP
     27#define CPU_ZERO_VM_CODEBUFFER_ZERO_HPP
     28
    2629 private:
    2730  void pd_initialize() {}
     31
     32#endif // CPU_ZERO_VM_CODEBUFFER_ZERO_HPP

  • trunk/openjdk/hotspot/src/cpu/zero/vm/copy_zero.hpp

    r278 r309  
    11/*
    2  * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved.
     2 * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
    33 * Copyright 2007 Red Hat, Inc.
    44 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    … …  
    2323 *
    2424 */
     25
     26#ifndef CPU_ZERO_VM_COPY_ZERO_HPP
     27#define CPU_ZERO_VM_COPY_ZERO_HPP
    2528
    2629// Inline functions for memory copy and fill.
    … …  
    177180  memset(to, 0, count);
    178181}
     182
     183#endif // CPU_ZERO_VM_COPY_ZERO_HPP

  • trunk/openjdk/hotspot/src/cpu/zero/vm/cppInterpreterGenerator_zero.hpp

    r278 r309  
    11/*
    2  * Copyright (c) 2003, 2007, Oracle and/or its affiliates. All rights reserved.
     2 * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
    33 * Copyright 2008, 2009 Red Hat, Inc.
    44 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    … …  
    2424 */
    2525
     26#ifndef CPU_ZERO_VM_CPPINTERPRETERGENERATOR_ZERO_HPP
     27#define CPU_ZERO_VM_CPPINTERPRETERGENERATOR_ZERO_HPP
     28
    2629 protected:
    2730  MacroAssembler* assembler() const {
    … …  
    3639    return (address) entry;
    3740  }
     41
     42#endif // CPU_ZERO_VM_CPPINTERPRETERGENERATOR_ZERO_HPP

  • trunk/openjdk/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp

    r278 r309  
    11/*
    2  * Copyright (c) 2003, 2007, Oracle and/or its affiliates. All rights reserved.
     2 * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
    33 * Copyright 2007, 2008, 2009, 2010 Red Hat, Inc.
    44 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    … …  
    2424 */
    2525
    26 #include "incls/_precompiled.incl"
    27 #include "incls/_cppInterpreter_zero.cpp.incl"
     26#include "precompiled.hpp"
     27#include "asm/assembler.hpp"
     28#include "interpreter/bytecodeHistogram.hpp"
     29#include "interpreter/cppInterpreter.hpp"
     30#include "interpreter/interpreter.hpp"
     31#include "interpreter/interpreterGenerator.hpp"
     32#include "interpreter/interpreterRuntime.hpp"
     33#include "oops/arrayOop.hpp"
     34#include "oops/methodDataOop.hpp"
     35#include "oops/methodOop.hpp"
     36#include "oops/oop.inline.hpp"
     37#include "prims/jvmtiExport.hpp"
     38#include "prims/jvmtiThreadState.hpp"
     39#include "runtime/arguments.hpp"
     40#include "runtime/deoptimization.hpp"
     41#include "runtime/frame.inline.hpp"
     42#include "runtime/interfaceSupport.hpp"
     43#include "runtime/sharedRuntime.hpp"
     44#include "runtime/stubRoutines.hpp"
     45#include "runtime/synchronizer.hpp"
     46#include "runtime/timer.hpp"
     47#include "runtime/vframeArray.hpp"
     48#include "stack_zero.inline.hpp"
     49#include "utilities/debug.hpp"
     50#ifdef SHARK
     51#include "shark/shark_globals.hpp"
     52#endif
    2853
    2954#ifdef CC_INTERP

  • trunk/openjdk/hotspot/src/cpu/zero/vm/cppInterpreter_zero.hpp

    r278 r309  
    11/*
    2  * Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved.
     2 * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
    33 * Copyright 2007, 2008, 2010 Red Hat, Inc.
    44 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    … …  
    2424 */
    2525
     26#ifndef CPU_ZERO_VM_CPPINTERPRETER_ZERO_HPP
     27#define CPU_ZERO_VM_CPPINTERPRETER_ZERO_HPP
     28
    2629 protected:
    2730  // Size of interpreter code
    … …  
    4245  // Fast result type determination
    4346  static BasicType result_type_of(methodOop method);
     47
     48#endif // CPU_ZERO_VM_CPPINTERPRETER_ZERO_HPP

  • trunk/openjdk/hotspot/src/cpu/zero/vm/debug_zero.cpp

    r278 r309  
    11/*
    2  * Copyright (c) 2003, 2007, Oracle and/or its affiliates. All rights reserved.
     2 * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
    33 * Copyright 2007 Red Hat, Inc.
    44 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    … …  
    2424 */
    2525
    26 #include "incls/_precompiled.incl"
    27 #include "incls/_debug_zero.cpp.incl"
     26#include "precompiled.hpp"
     27#include "code/codeCache.hpp"
     28#include "code/nmethod.hpp"
     29#include "runtime/frame.hpp"
     30#include "runtime/init.hpp"
     31#include "runtime/os.hpp"
     32#include "utilities/debug.hpp"
     33#include "utilities/top.hpp"
    2834
    2935void pd_ps(frame f) {

  • trunk/openjdk/hotspot/src/cpu/zero/vm/depChecker_zero.cpp

    r278 r309  
    11/*
    2  * Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved.
     2 * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
    33 * Copyright 2009 Red Hat, Inc.
    44 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    … …  
    2424 */
    2525
     26#include "precompiled.hpp"
     27#include "compiler/disassembler.hpp"
     28#include "depChecker_zero.hpp"
     29
    2630// This file is intentionally empty

  • trunk/openjdk/hotspot/src/cpu/zero/vm/depChecker_zero.hpp

    r278 r309  
    11/*
    2  * Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved.
     2 * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
    33 * Copyright 2009 Red Hat, Inc.
    44 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    … …  
    2424 */
    2525
     26#ifndef CPU_ZERO_VM_DEPCHECKER_ZERO_HPP
     27#define CPU_ZERO_VM_DEPCHECKER_ZERO_HPP
     28
    2629// This file is intentionally empty
     30
     31#endif // CPU_ZERO_VM_DEPCHECKER_ZERO_HPP

  • trunk/openjdk/hotspot/src/cpu/zero/vm/disassembler_zero.cpp

    r278 r309  
    11/*
    2  * Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved.
     2 * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
    33 * Copyright 2009 Red Hat, Inc.
    44 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    … …  
    2424 */
    2525
     26#include "precompiled.hpp"
     27
    2628// This file is intentionally empty

  • trunk/openjdk/hotspot/src/cpu/zero/vm/disassembler_zero.hpp

    r278 r309  
    11/*
    2  * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
     2 * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
    33 * Copyright 2007, 2010 Red Hat, Inc.
    44 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    … …  
    2424 */
    2525
     26#ifndef CPU_ZERO_VM_DISASSEMBLER_ZERO_HPP
     27#define CPU_ZERO_VM_DISASSEMBLER_ZERO_HPP
     28
    2629  static int pd_instruction_alignment() {
    2730    return 1;
    … …  
    3134    return "";
    3235  }
     36
     37#endif // CPU_ZERO_VM_DISASSEMBLER_ZERO_HPP

  • trunk/openjdk/hotspot/src/cpu/zero/vm/dump_zero.cpp

    r278 r309  
    11/*
    2  * Copyright (c) 2004, 2007, Oracle and/or its affiliates. All rights reserved.
     2 * Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
    33 * Copyright 2007 Red Hat, Inc.
    44 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    … …  
    2424 */
    2525
    26 #include "incls/_precompiled.incl"
    27 #include "incls/_dump_zero.cpp.incl"
     26#include "precompiled.hpp"
     27#include "assembler_zero.inline.hpp"
     28#include "memory/compactingPermGenGen.hpp"
     29#include "memory/generation.inline.hpp"
     30#include "memory/space.inline.hpp"
    2831
    2932void CompactingPermGenGen::generate_vtable_methods(void** vtbl_list,

  • trunk/openjdk/hotspot/src/cpu/zero/vm/entryFrame_zero.hpp

    r278 r309  
    11/*
    2  * Copyright (c) 2003, 2007, Oracle and/or its affiliates. All rights reserved.
     2 * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
    33 * Copyright 2008, 2010 Red Hat, Inc.
    44 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    … …  
    2323 *
    2424 */
     25
     26#ifndef CPU_ZERO_VM_ENTRYFRAME_ZERO_HPP
     27#define CPU_ZERO_VM_ENTRYFRAME_ZERO_HPP
     28
     29#include "runtime/javaCalls.hpp"
     30#include "stack_zero.hpp"
    2531
    2632// |  ...               |
    … …  
    6470                     int   buflen) const;
    6571};
     72
     73#endif // CPU_ZERO_VM_ENTRYFRAME_ZERO_HPP

  • trunk/openjdk/hotspot/src/cpu/zero/vm/entry_zero.hpp

    r278 r309  
    11/*
    2  * Copyright (c) 2003, 2007, Oracle and/or its affiliates. All rights reserved.
     2 * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
    33 * Copyright 2008, 2009, 2010 Red Hat, Inc.
    44 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    … …  
    2323 *
    2424 */
     25
     26#ifndef CPU_ZERO_VM_ENTRY_ZERO_HPP
     27#define CPU_ZERO_VM_ENTRY_ZERO_HPP
    2528
    2629class ZeroEntry {
    … …  
    7376  }
    7477};
     78
     79#endif // CPU_ZERO_VM_ENTRY_ZERO_HPP

  • trunk/openjdk/hotspot/src/cpu/zero/vm/fakeStubFrame_zero.hpp

    r278 r309  
    11/*
    2  * Copyright (c) 2003, 2007, Oracle and/or its affiliates. All rights reserved.
     2 * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
    33 * Copyright 2008, 2010 Red Hat, Inc.
    44 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    … …  
    2323 *
    2424 */
     25
     26#ifndef CPU_ZERO_VM_FAKESTUBFRAME_ZERO_HPP
     27#define CPU_ZERO_VM_FAKESTUBFRAME_ZERO_HPP
     28
     29#include "stack_zero.hpp"
    2530
    2631// |  ...               |
    … …  
    5257                     int   buflen) const {}
    5358};
     59
     60#endif // CPU_ZERO_VM_FAKESTUBFRAME_ZERO_HPP

  • trunk/openjdk/hotspot/src/cpu/zero/vm/frame_zero.cpp

    r278 r309  
    11/*
    2  * Copyright (c) 2003, 2007, Oracle and/or its affiliates. All rights reserved.
     2 * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
    33 * Copyright 2007, 2008, 2009, 2010 Red Hat, Inc.
    44 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    … …  
    2424 */
    2525
    26 #include "incls/_precompiled.incl"
    27 #include "incls/_frame_zero.cpp.incl"
     26#include "precompiled.hpp"
     27#include "code/scopeDesc.hpp"
     28#include "interpreter/interpreter.hpp"
     29#include "interpreter/interpreterRuntime.hpp"
     30#include "memory/resourceArea.hpp"
     31#include "oops/markOop.hpp"
     32#include "oops/methodOop.hpp"
     33#include "oops/oop.inline.hpp"
     34#include "runtime/frame.inline.hpp"
     35#include "runtime/handles.inline.hpp"
     36#include "runtime/javaCalls.hpp"
     37#include "runtime/monitorChunk.hpp"
     38#include "runtime/signature.hpp"
     39#include "runtime/stubCodeGenerator.hpp"
     40#include "runtime/stubRoutines.hpp"
     41#include "vmreg_zero.inline.hpp"
     42#ifdef COMPILER1
     43#include "c1/c1_Runtime1.hpp"
     44#include "runtime/vframeArray.hpp"
     45#endif
    2846
    2947#ifdef ASSERT

  • trunk/openjdk/hotspot/src/cpu/zero/vm/frame_zero.hpp

    r278 r309  
    11/*
    2  * Copyright (c) 2003, 2007, Oracle and/or its affiliates. All rights reserved.
     2 * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
    33 * Copyright 2007, 2008, 2009, 2010 Red Hat, Inc.
    44 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    … …  
    2323 *
    2424 */
     25
     26#ifndef CPU_ZERO_VM_FRAME_ZERO_HPP
     27#define CPU_ZERO_VM_FRAME_ZERO_HPP
     28
     29#include "runtime/synchronizer.hpp"
     30#include "utilities/top.hpp"
    2531
    2632// A frame represents a physical stack frame on the Zero stack.
    … …  
    7379                           char*         buf,
    7480                           int           buflen) const;
     81
     82#endif // CPU_ZERO_VM_FRAME_ZERO_HPP

  • trunk/openjdk/hotspot/src/cpu/zero/vm/frame_zero.inline.hpp

    r278 r309  
    11/*
    2  * Copyright (c) 2003, 2007, Oracle and/or its affiliates. All rights reserved.
     2 * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
    33 * Copyright 2007, 2008, 2009, 2010 Red Hat, Inc.
    44 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    … …  
    2323 *
    2424 */
     25
     26#ifndef CPU_ZERO_VM_FRAME_ZERO_INLINE_HPP
     27#define CPU_ZERO_VM_FRAME_ZERO_INLINE_HPP
    2528
    2629// Constructors
    … …  
    150153    return (intptr_t *) -1;
    151154}
     155
     156#endif // CPU_ZERO_VM_FRAME_ZERO_INLINE_HPP

  • trunk/openjdk/hotspot/src/cpu/zero/vm/globalDefinitions_zero.hpp

    r278 r309  
    11/*
    2  * Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved.
     2 * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
    33 * Copyright 2009 Red Hat, Inc.
    44 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    … …  
    2424 */
    2525
     26#ifndef CPU_ZERO_VM_GLOBALDEFINITIONS_ZERO_HPP
     27#define CPU_ZERO_VM_GLOBALDEFINITIONS_ZERO_HPP
     28
    2629#include <ffi.h>
     30
     31#endif // CPU_ZERO_VM_GLOBALDEFINITIONS_ZERO_HPP

  • trunk/openjdk/hotspot/src/cpu/zero/vm/globals_zero.hpp

    r278 r309  
    11/*
    2  * Copyright (c) 2000, 2006, Oracle and/or its affiliates. All rights reserved.
     2 * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
    33 * Copyright 2007, 2008, 2009, 2010 Red Hat, Inc.
    44 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    … …  
    2424 */
    2525
     26#ifndef CPU_ZERO_VM_GLOBALS_ZERO_HPP
     27#define CPU_ZERO_VM_GLOBALS_ZERO_HPP
     28
     29#include "utilities/globalDefinitions.hpp"
     30#include "utilities/macros.hpp"
     31
    2632// Set the default values for platform dependent flags used by the
    2733// runtime system.  See globals.hpp for details of what they do.
    … …  
    4652define_pd_global(bool,  RewriteBytecodes,     true);
    4753define_pd_global(bool,  RewriteFrequentPairs, true);
     54
     55define_pd_global(bool,  UseMembar,            false);
     56
     57#endif // CPU_ZERO_VM_GLOBALS_ZERO_HPP

  • trunk/openjdk/hotspot/src/cpu/zero/vm/icBuffer_zero.cpp

    r278 r309  
    11/*
    2  * Copyright (c) 2003, 2006, Oracle and/or its affiliates. All rights reserved.
     2 * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
    33 * Copyright 2007 Red Hat, Inc.
    44 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    … …  
    2424 */
    2525
    26 #include "incls/_precompiled.incl"
    27 #include "incls/_icBuffer_zero.cpp.incl"
     26#include "precompiled.hpp"
     27#include "asm/assembler.hpp"
     28#include "assembler_zero.inline.hpp"
     29#include "code/icBuffer.hpp"
     30#include "gc_interface/collectedHeap.inline.hpp"
     31#include "interpreter/bytecodes.hpp"
     32#include "memory/resourceArea.hpp"
     33#include "nativeInst_zero.hpp"
     34#include "oops/oop.inline.hpp"
     35#include "oops/oop.inline2.hpp"
    2836
    2937int InlineCacheBuffer::ic_stub_code_size() {

  • trunk/openjdk/hotspot/src/cpu/zero/vm/icache_zero.cpp

    r278 r309  
    11/*
    2  * Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved.
     2 * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
    33 * Copyright 2007, 2009 Red Hat, Inc.
    44 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    … …  
    2424 */
    2525
    26 #include "incls/_precompiled.incl"
    27 #include "incls/_icache_zero.cpp.incl"
     26#include "precompiled.hpp"
     27#include "assembler_zero.inline.hpp"
     28#include "runtime/icache.hpp"
    2829
    2930void ICacheStubGenerator::generate_icache_flush(

  • trunk/openjdk/hotspot/src/cpu/zero/vm/icache_zero.hpp

    r278 r309  
    11/*
    2  * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved.
     2 * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
    33 * Copyright 2007, 2009 Red Hat, Inc.
    44 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    … …  
    2424 */
    2525
     26#ifndef CPU_ZERO_VM_ICACHE_ZERO_HPP
     27#define CPU_ZERO_VM_ICACHE_ZERO_HPP
     28
    2629// Interface for updating the instruction cache.  Whenever the VM
    2730// modifies code, part of the processor instruction cache potentially
    … …  
    3538  static void invalidate_range(address start, int nbytes) {}
    3639};
     40
     41#endif // CPU_ZERO_VM_ICACHE_ZERO_HPP

  • trunk/openjdk/hotspot/src/cpu/zero/vm/interp_masm_zero.cpp

    r278 r309  
    11/*
    2  * Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved.
     2 * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
    33 * Copyright 2009 Red Hat, Inc.
    44 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    … …  
    2424 */
    2525
     26#include "precompiled.hpp"
     27#include "interp_masm_zero.hpp"
     28#include "interpreter/interpreter.hpp"
     29#include "interpreter/interpreterRuntime.hpp"
     30#include "oops/arrayOop.hpp"
     31#include "oops/markOop.hpp"
     32#include "oops/methodDataOop.hpp"
     33#include "oops/methodOop.hpp"
     34#include "prims/jvmtiExport.hpp"
     35#include "prims/jvmtiRedefineClassesTrace.hpp"
     36#include "prims/jvmtiThreadState.hpp"
     37#include "runtime/basicLock.hpp"
     38#include "runtime/biasedLocking.hpp"
     39#include "runtime/sharedRuntime.hpp"
     40#ifdef TARGET_OS_FAMILY_linux
     41# include "thread_linux.inline.hpp"
     42#endif
     43
    2644// This file is intentionally empty

  • trunk/openjdk/hotspot/src/cpu/zero/vm/interp_masm_zero.hpp

    r278 r309  
    11/*
    2  * Copyright (c) 2003, 2007, Oracle and/or its affiliates. All rights reserved.
     2 * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
    33 * Copyright 2007 Red Hat, Inc.
    44 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    … …  
    2424 */
    2525
     26#ifndef CPU_ZERO_VM_INTERP_MASM_ZERO_HPP
     27#define CPU_ZERO_VM_INTERP_MASM_ZERO_HPP
     28
     29#include "assembler_zero.inline.hpp"
     30#include "interpreter/invocationCounter.hpp"
     31
    2632// This file specializes the assember with interpreter-specific macros
    2733
    … …  
    3743  }
    3844};
     45
     46#endif // CPU_ZERO_VM_INTERP_MASM_ZERO_HPP

  • trunk/openjdk/hotspot/src/cpu/zero/vm/interpreterFrame_zero.hpp

    r278 r309  
    11/*
    2  * Copyright (c) 2003, 2007, Oracle and/or its affiliates. All rights reserved.
     2 * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
    33 * Copyright 2008, 2010 Red Hat, Inc.
    44 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    … …  
    2323 *
    2424 */
     25
     26#ifndef CPU_ZERO_VM_INTERPRETERFRAME_ZERO_HPP
     27#define CPU_ZERO_VM_INTERPRETERFRAME_ZERO_HPP
     28
     29#include "interpreter/bytecodeInterpreter.hpp"
     30#include "oops/methodOop.hpp"
     31#include "runtime/thread.hpp"
     32#include "stack_zero.hpp"
    2533
    2634#ifdef CC_INTERP
    … …  
    7280};
    7381#endif // CC_INTERP
     82
     83#endif // CPU_ZERO_VM_INTERPRETERFRAME_ZERO_HPP

  • trunk/openjdk/hotspot/src/cpu/zero/vm/interpreterGenerator_zero.hpp

    r278 r309  
    11/*
    2  * Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved.
     2 * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
    33 * Copyright 2007 Red Hat, Inc.
    44 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    … …  
    2424 */
    2525
     26#ifndef CPU_ZERO_VM_INTERPRETERGENERATOR_ZERO_HPP
     27#define CPU_ZERO_VM_INTERPRETERGENERATOR_ZERO_HPP
     28
    2629  // Generation of Interpreter
    2730  //
    … …  
    3639  address generate_accessor_entry();
    3740  address generate_method_handle_entry();
     41
     42#endif // CPU_ZERO_VM_INTERPRETERGENERATOR_ZERO_HPP

  • trunk/openjdk/hotspot/src/cpu/zero/vm/interpreterRT_zero.cpp

    r278 r309  
    11/*
    2  * Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved.
     2 * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
    33 * Copyright 2007, 2008, 2010 Red Hat, Inc.
    44 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    … …  
    2424 */
    2525
    26 #include "incls/_precompiled.incl"
    27 #include "incls/_interpreterRT_zero.cpp.incl"
     26#include "precompiled.hpp"
     27#include "interpreter/interpreter.hpp"
     28#include "interpreter/interpreterRuntime.hpp"
     29#include "memory/allocation.inline.hpp"
     30#include "memory/universe.inline.hpp"
     31#include "oops/methodOop.hpp"
     32#include "oops/oop.inline.hpp"
     33#include "runtime/handles.inline.hpp"
     34#include "runtime/icache.hpp"
     35#include "runtime/interfaceSupport.hpp"
     36#include "runtime/signature.hpp"
     37#include "stack_zero.inline.hpp"
    2838
    2939void InterpreterRuntime::SignatureHandlerGeneratorBase::pass_int() {

  • trunk/openjdk/hotspot/src/cpu/zero/vm/interpreterRT_zero.hpp

    r278 r309  
    11/*
    2  * Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved.
     2 * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
    33 * Copyright 2007, 2008 Red Hat, Inc.
    44 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    … …  
    2323 *
    2424 */
     25
     26#ifndef CPU_ZERO_VM_INTERPRETERRT_ZERO_HPP
     27#define CPU_ZERO_VM_INTERPRETERRT_ZERO_HPP
     28
     29#include "memory/allocation.hpp"
    2530
    2631class SignatureHandler {
    … …  
    9398 public:
    9499  SignatureHandlerGenerator(methodHandle method, CodeBuffer* buffer)
    95     : SignatureHandlerGeneratorBase(method, (ffi_cif *) buffer->code_end()),
     100    : SignatureHandlerGeneratorBase(method, (ffi_cif *) buffer->insts_end()),
    96101      _cb(buffer) {
    97     _cb->set_code_end((address) (cif() + 1));
     102    _cb->set_insts_end((address) (cif() + 1));
    98103  }
    99104
    100105 private:
    101106  void push(intptr_t value) {
    102     intptr_t *dst = (intptr_t *) _cb->code_end();
    103     _cb->set_code_end((address) (dst + 1));
     107    intptr_t *dst = (intptr_t *) _cb->insts_end();
     108    _cb->set_insts_end((address) (dst + 1));
    104109    *dst = value;
    105110  }
    … …  
    126131  }
    127132};
     133
     134#endif // CPU_ZERO_VM_INTERPRETERRT_ZERO_HPP

  • trunk/openjdk/hotspot/src/cpu/zero/vm/interpreter_zero.cpp

    r278 r309  
    11/*
    2  * Copyright (c) 2003, 2007, Oracle and/or its affiliates. All rights reserved.
     2 * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
    33 * Copyright 2007, 2008, 2009, 2010 Red Hat, Inc.
    44 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    … …  
    2424 */
    2525
    26 #include "incls/_precompiled.incl"
    27 #include "incls/_interpreter_zero.cpp.incl"
     26#include "precompiled.hpp"
     27#include "asm/assembler.hpp"
     28#include "interpreter/bytecodeHistogram.hpp"
     29#include "interpreter/interpreter.hpp"
     30#include "interpreter/interpreterGenerator.hpp"
     31#include "interpreter/interpreterRuntime.hpp"
     32#include "interpreter/templateTable.hpp"
     33#include "oops/arrayOop.hpp"
     34#include "oops/methodDataOop.hpp"
     35#include "oops/methodOop.hpp"
     36#include "oops/oop.inline.hpp"
     37#include "prims/jvmtiExport.hpp"
     38#include "prims/jvmtiThreadState.hpp"
     39#include "prims/methodHandles.hpp"
     40#include "runtime/arguments.hpp"
     41#include "runtime/deoptimization.hpp"
     42#include "runtime/frame.inline.hpp"
     43#include "runtime/sharedRuntime.hpp"
     44#include "runtime/stubRoutines.hpp"
     45#include "runtime/synchronizer.hpp"
     46#include "runtime/timer.hpp"
     47#include "runtime/vframeArray.hpp"
     48#include "utilities/debug.hpp"
     49#ifdef COMPILER1
     50#include "c1/c1_Runtime1.hpp"
     51#endif
    2852
    2953address AbstractInterpreterGenerator::generate_slow_signature_handler() {

  • trunk/openjdk/hotspot/src/cpu/zero/vm/interpreter_zero.hpp

    r278 r309  
    2424 */
    2525
     26#ifndef CPU_ZERO_VM_INTERPRETER_ZERO_HPP
     27#define CPU_ZERO_VM_INTERPRETER_ZERO_HPP
     28
    2629 public:
    2730  static void invoke_method(methodOop method, address entry_point, TRAPS) {
    … …  
    4851    return stackElementWords * i;
    4952  }
     53
     54#endif // CPU_ZERO_VM_INTERPRETER_ZERO_HPP

  • trunk/openjdk/hotspot/src/cpu/zero/vm/javaFrameAnchor_zero.hpp

    r278 r309  
    11/*
    2  * Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved.
     2 * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
    33 * Copyright 2007, 2008, 2010 Red Hat, Inc.
    44 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    … …  
    2323 *
    2424 */
     25
     26#ifndef CPU_ZERO_VM_JAVAFRAMEANCHOR_ZERO_HPP
     27#define CPU_ZERO_VM_JAVAFRAMEANCHOR_ZERO_HPP
    2528
    2629 private:
    … …  
    9093    return byte_offset_of(JavaFrameAnchor, _last_Java_fp);
    9194  }
     95
     96#endif // CPU_ZERO_VM_JAVAFRAMEANCHOR_ZERO_HPP

  • trunk/openjdk/hotspot/src/cpu/zero/vm/jniFastGetField_zero.cpp

    r278 r309  
    11/*
    2  * Copyright (c) 2004, 2006, Oracle and/or its affiliates. All rights reserved.
     2 * Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
    33 * Copyright 2007 Red Hat, Inc.
    44 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    … …  
    2424 */
    2525
    26 #include "incls/_precompiled.incl"
    27 #include "incls/_jniFastGetField_zero.cpp.incl"
     26#include "precompiled.hpp"
     27#include "assembler_zero.inline.hpp"
     28#include "memory/resourceArea.hpp"
     29#include "prims/jniFastGetField.hpp"
     30#include "prims/jvm_misc.hpp"
     31#include "runtime/safepoint.hpp"
    2832
    2933address JNI_FastGetField::generate_fast_get_boolean_field() {

  • trunk/openjdk/hotspot/src/cpu/zero/vm/jniTypes_zero.hpp

    r278 r309  
    11/*
    2  * Copyright (c) 1998, 2002, Oracle and/or its affiliates. All rights reserved.
     2 * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
    33 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44 *
    … …  
    2222 *
    2323 */
     24
     25#ifndef CPU_ZERO_VM_JNITYPES_ZERO_HPP
     26#define CPU_ZERO_VM_JNITYPES_ZERO_HPP
     27
     28#include "memory/allocation.hpp"
     29#include "oops/oop.hpp"
     30#include "prims/jni.h"
    2431
    2532// This file holds platform-dependent routines used to write primitive jni
    … …  
    107114
    108115};
     116
     117#endif // CPU_ZERO_VM_JNITYPES_ZERO_HPP

  • trunk/openjdk/hotspot/src/cpu/zero/vm/jni_zero.h

    r278 r309  
    11/*
    2  * Copyright (c) 1997, 2004, Oracle and/or its affiliates. All rights reserved.
     2 * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
    33 * Copyright 2009 Red Hat, Inc.
    44 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.

  • trunk/openjdk/hotspot/src/cpu/zero/vm/methodHandles_zero.cpp

    r278 r309  
    11/*
    2  * Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved.
     2 * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
    33 * Copyright 2009, 2010 Red Hat, Inc.
    44 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    … …  
    2424 */
    2525
    26 #include "incls/_precompiled.incl"
    27 #include "incls/_methodHandles_zero.cpp.incl"
     26#include "precompiled.hpp"
     27#include "interpreter/interpreter.hpp"
     28#include "memory/allocation.inline.hpp"
     29#include "prims/methodHandles.hpp"
    2830
    2931int MethodHandles::adapter_conversion_ops_supported_mask() {

  • trunk/openjdk/hotspot/src/cpu/zero/vm/nativeInst_zero.cpp

    r278 r309  
    11/*
    2  * Copyright (c) 2003, 2007, Oracle and/or its affiliates. All rights reserved.
     2 * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
    33 * Copyright 2008 Red Hat, Inc.
    44 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    … …  
    2424 */
    2525
    26 #include "incls/_precompiled.incl"
    27 #include "incls/_nativeInst_zero.cpp.incl"
     26#include "precompiled.hpp"
     27#include "assembler_zero.inline.hpp"
     28#include "memory/resourceArea.hpp"
     29#include "nativeInst_zero.hpp"
     30#include "oops/oop.inline.hpp"
     31#include "runtime/handles.hpp"
     32#include "runtime/sharedRuntime.hpp"
     33#include "runtime/stubRoutines.hpp"
     34#include "utilities/ostream.hpp"
     35#ifdef COMPILER1
     36#include "c1/c1_Runtime1.hpp"
     37#endif
    2838
    2939// This method is called by nmethod::make_not_entrant_or_zombie to

  • trunk/openjdk/hotspot/src/cpu/zero/vm/nativeInst_zero.hpp

    r278 r309  
    11/*
    2  * Copyright (c) 2003, 2006, Oracle and/or its affiliates. All rights reserved.
     2 * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
    33 * Copyright 2007 Red Hat, Inc.
    44 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    … …  
    2323 *
    2424 */
     25
     26#ifndef CPU_ZERO_VM_NATIVEINST_ZERO_HPP
     27#define CPU_ZERO_VM_NATIVEINST_ZERO_HPP
     28
     29#include "asm/assembler.hpp"
     30#include "memory/allocation.hpp"
     31#include "runtime/icache.hpp"
     32#include "runtime/os.hpp"
     33#include "utilities/top.hpp"
    2534
    2635// We have interfaces for the following instructions:
    … …  
    184193  ShouldNotCallThis();
    185194}
     195
     196#endif // CPU_ZERO_VM_NATIVEINST_ZERO_HPP

  • trunk/openjdk/hotspot/src/cpu/zero/vm/registerMap_zero.hpp

    r278 r309  
    11/*
    2  * Copyright (c) 1998, 2007, Oracle and/or its affiliates. All rights reserved.
     2 * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
    33 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44 *
    … …  
    2323 */
    2424
     25#ifndef CPU_ZERO_VM_REGISTERMAP_ZERO_HPP
     26#define CPU_ZERO_VM_REGISTERMAP_ZERO_HPP
     27
    2528  // machine-dependent implemention for register maps
    2629  friend class frame;
    … …  
    3841  void pd_initialize() {}
    3942  void pd_initialize_from(const RegisterMap* map) {}
     43
     44#endif // CPU_ZERO_VM_REGISTERMAP_ZERO_HPP

  • trunk/openjdk/hotspot/src/cpu/zero/vm/register_definitions_zero.cpp

    r278 r309  
    11/*
    2  * Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved.
     2 * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
    33 * Copyright 2009 Red Hat, Inc.
    44 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    … …  
    2424 */
    2525
     26#include "precompiled.hpp"
     27#include "asm/assembler.hpp"
     28#include "asm/register.hpp"
     29#include "interp_masm_zero.hpp"
     30#include "register_zero.hpp"
     31
    2632// This file is intentionally empty

  • trunk/openjdk/hotspot/src/cpu/zero/vm/register_zero.cpp

    r278 r309  
    11/*
    2  * Copyright (c) 2000, 2007, Oracle and/or its affiliates. All rights reserved.
     2 * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
    33 * Copyright 2007 Red Hat, Inc.
    44 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    … …  
    2424 */
    2525
    26 #include "incls/_precompiled.incl"
    27 #include "incls/_register_zero.cpp.incl"
     26#include "precompiled.hpp"
     27#include "register_zero.hpp"
    2828
    2929const int ConcreteRegisterImpl::max_gpr = RegisterImpl::number_of_registers;

  • trunk/openjdk/hotspot/src/cpu/zero/vm/register_zero.hpp

    r278 r309  
    11/*
    2  * Copyright (c) 2000, 2007, Oracle and/or its affiliates. All rights reserved.
     2 * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
    33 * Copyright 2007 Red Hat, Inc.
    44 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    … …  
    2323 *
    2424 */
     25
     26#ifndef CPU_ZERO_VM_REGISTER_ZERO_HPP
     27#define CPU_ZERO_VM_REGISTER_ZERO_HPP
     28
     29#include "asm/register.hpp"
     30#include "vm_version_zero.hpp"
    2531
    2632class VMRegImpl;
    … …  
    109115
    110116CONSTANT_REGISTER_DECLARATION(Register, noreg, (-1));
     117
     118#endif // CPU_ZERO_VM_REGISTER_ZERO_HPP

  • trunk/openjdk/hotspot/src/cpu/zero/vm/relocInfo_zero.cpp

    r278 r309  
    11/*
    2  * Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved.
     2 * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
    33 * Copyright 2007, 2009 Red Hat, Inc.
    44 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    … …  
    2424 */
    2525
    26 #include "incls/_precompiled.incl"
    27 #include "incls/_relocInfo_zero.cpp.incl"
     26#include "precompiled.hpp"
     27#include "asm/assembler.inline.hpp"
     28#include "assembler_zero.inline.hpp"
     29#include "code/relocInfo.hpp"
     30#include "nativeInst_zero.hpp"
     31#include "oops/oop.inline.hpp"
     32#include "runtime/safepoint.hpp"
    2833
    2934void Relocation::pd_set_data_value(address x, intptr_t o) {

  • trunk/openjdk/hotspot/src/cpu/zero/vm/relocInfo_zero.hpp

    r278 r309  
    11/*
    2  * Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved.
     2 * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
    33 * Copyright 2007 Red Hat, Inc.
    44 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    … …  
    2424 */
    2525
     26#ifndef CPU_ZERO_VM_RELOCINFO_ZERO_HPP
     27#define CPU_ZERO_VM_RELOCINFO_ZERO_HPP
     28
    2629  // machine-dependent parts of class relocInfo
    2730 private:
    … …  
    3134    format_width =  1
    3235  };
     36
     37#endif // CPU_ZERO_VM_RELOCINFO_ZERO_HPP

  • trunk/openjdk/hotspot/src/cpu/zero/vm/sharedRuntime_zero.cpp

    r278 r309  
    11/*
    2  * Copyright (c) 2003, 2007, Oracle and/or its affiliates. All rights reserved.
     2 * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
    33 * Copyright 2007, 2008, 2009, 2010 Red Hat, Inc.
    44 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    … …  
    2424 */
    2525
    26 #include "incls/_precompiled.incl"
    27 #include "incls/_sharedRuntime_zero.cpp.incl"
     26#include "precompiled.hpp"
     27#include "asm/assembler.hpp"
     28#include "assembler_zero.inline.hpp"
     29#include "code/debugInfoRec.hpp"
     30#include "code/icBuffer.hpp"
     31#include "code/vtableStubs.hpp"
     32#include "interpreter/interpreter.hpp"
     33#include "oops/compiledICHolderOop.hpp"
     34#include "prims/jvmtiRedefineClassesTrace.hpp"
     35#include "runtime/sharedRuntime.hpp"
     36#include "runtime/vframeArray.hpp"
     37#include "vmreg_zero.inline.hpp"
     38#ifdef COMPILER1
     39#include "c1/c1_Runtime1.hpp"
     40#endif
     41#ifdef COMPILER2
     42#include "opto/runtime.hpp"
     43#endif
     44#ifdef SHARK
     45#include "compiler/compileBroker.hpp"
     46#include "shark/sharkCompiler.hpp"
     47#endif
    2848
    2949DeoptimizationBlob *SharedRuntime::_deopt_blob;

  • trunk/openjdk/hotspot/src/cpu/zero/vm/sharkFrame_zero.hpp

    r278 r309  
    11/*
    2  * Copyright (c) 2003, 2007, Oracle and/or its affiliates. All rights reserved.
     2 * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
    33 * Copyright 2008, 2009 Red Hat, Inc.
    44 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    … …  
    2323 *
    2424 */
     25
     26#ifndef CPU_ZERO_VM_SHARKFRAME_ZERO_HPP
     27#define CPU_ZERO_VM_SHARKFRAME_ZERO_HPP
     28
     29#include "oops/methodOop.hpp"
     30#include "stack_zero.hpp"
    2531
    2632// |  ...               |
    … …  
    7884                     int   buflen) const;
    7985};
     86
     87#endif // CPU_ZERO_VM_SHARKFRAME_ZERO_HPP

  • trunk/openjdk/hotspot/src/cpu/zero/vm/shark_globals_zero.hpp

    r278 r309  
    11/*
    2  * Copyright (c) 2000, 2007, Oracle and/or its affiliates. All rights reserved.
     2 * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
    33 * Copyright 2008, 2009, 2010 Red Hat, Inc.
    44 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    … …  
    2323 *
    2424 */
     25
     26#ifndef CPU_ZERO_VM_SHARK_GLOBALS_ZERO_HPP
     27#define CPU_ZERO_VM_SHARK_GLOBALS_ZERO_HPP
    2528
    2629// Set the default values for platform dependent flags used by the
    … …  
    6164define_pd_global(uint64_t, MaxRAM,                       1ULL*G);
    6265define_pd_global(bool,     CICompileOSR,                 true );
     66
     67#endif // CPU_ZERO_VM_SHARK_GLOBALS_ZERO_HPP

  • trunk/openjdk/hotspot/src/cpu/zero/vm/stack_zero.cpp

    r278 r309  
    11/*
    2  * Copyright (c) 2003, 2007, Oracle and/or its affiliates. All rights reserved.
     2 * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
    33 * Copyright 2010 Red Hat, Inc.
    44 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    … …  
    2424 */
    2525
    26 #include "incls/_precompiled.incl"
    27 #include "incls/_stack_zero.cpp.incl"
     26#include "precompiled.hpp"
     27#include "interpreter/interpreterRuntime.hpp"
     28#include "stack_zero.hpp"
     29#include "stack_zero.inline.hpp"
    2830
    2931int ZeroStack::suggest_size(Thread *thread) const {

  • trunk/openjdk/hotspot/src/cpu/zero/vm/stack_zero.hpp

    r278 r309  
    11/*
    2  * Copyright (c) 2003, 2007, Oracle and/or its affiliates. All rights reserved.
     2 * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
    33 * Copyright 2008, 2009, 2010 Red Hat, Inc.
    44 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    … …  
    2323 *
    2424 */
     25
     26#ifndef CPU_ZERO_VM_STACK_ZERO_HPP
     27#define CPU_ZERO_VM_STACK_ZERO_HPP
     28
     29#include "utilities/sizes.hpp"
    2530
    2631class ZeroStack {
    … …  
    218223                        int       buflen) const;
    219224};
     225
     226#endif // CPU_ZERO_VM_STACK_ZERO_HPP

  • trunk/openjdk/hotspot/src/cpu/zero/vm/stack_zero.inline.hpp

    r278 r309  
    11/*
    2  * Copyright (c) 2003, 2007, Oracle and/or its affiliates. All rights reserved.
     2 * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
    33 * Copyright 2010 Red Hat, Inc.
    44 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    … …  
    2323 *
    2424 */
     25
     26#ifndef CPU_ZERO_VM_STACK_ZERO_INLINE_HPP
     27#define CPU_ZERO_VM_STACK_ZERO_INLINE_HPP
     28
     29#include "runtime/thread.hpp"
     30#include "stack_zero.hpp"
    2531
    2632// This function should match SharkStack::CreateStackOverflowCheck
    … …  
    4753  return stack_free - shadow_pages_size();
    4854}
     55
     56#endif // CPU_ZERO_VM_STACK_ZERO_INLINE_HPP

  • trunk/openjdk/hotspot/src/cpu/zero/vm/stubGenerator_zero.cpp

    r278 r309  
    11/*
    2  * Copyright (c) 2003, 2007, Oracle and/or its affiliates. All rights reserved.
     2 * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
    33 * Copyright 2007, 2008, 2010 Red Hat, Inc.
    44 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    … …  
    2424 */
    2525
    26 #include "incls/_precompiled.incl"
    27 #include "incls/_stubGenerator_zero.cpp.incl"
     26#include "precompiled.hpp"
     27#include "asm/assembler.hpp"
     28#include "assembler_zero.inline.hpp"
     29#include "interpreter/interpreter.hpp"
     30#include "nativeInst_zero.hpp"
     31#include "oops/instanceOop.hpp"
     32#include "oops/methodOop.hpp"
     33#include "oops/objArrayKlass.hpp"
     34#include "oops/oop.inline.hpp"
     35#include "prims/methodHandles.hpp"
     36#include "runtime/frame.inline.hpp"
     37#include "runtime/handles.inline.hpp"
     38#include "runtime/sharedRuntime.hpp"
     39#include "runtime/stubCodeGenerator.hpp"
     40#include "runtime/stubRoutines.hpp"
     41#include "stack_zero.inline.hpp"
     42#include "utilities/top.hpp"
     43#ifdef TARGET_OS_FAMILY_linux
     44# include "thread_linux.inline.hpp"
     45#endif
     46#ifdef COMPILER2
     47#include "opto/runtime.hpp"
     48#endif
    2849
    2950// Declaration and definition of StubGenerator (no .hpp file).

  • trunk/openjdk/hotspot/src/cpu/zero/vm/stubRoutines_zero.cpp

    r278 r309  
    11/*
    2  * Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved.
     2 * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
    33 * Copyright 2008, 2009 Red Hat, Inc.
    44 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    … …  
    2424 */
    2525
    26 #include "incls/_precompiled.incl"
    27 #include "incls/_stubRoutines_zero.cpp.incl"
     26#include "precompiled.hpp"
     27#include "runtime/deoptimization.hpp"
     28#include "runtime/frame.inline.hpp"
     29#include "runtime/stubRoutines.hpp"
     30#ifdef TARGET_OS_FAMILY_linux
     31# include "thread_linux.inline.hpp"
     32#endif
    2833
    2934#ifdef IA32

  • trunk/openjdk/hotspot/src/cpu/zero/vm/stubRoutines_zero.hpp

    r278 r309  
    11/*
    2  * Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved.
     2 * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
    33 * Copyright 2007, 2008, 2009, 2010 Red Hat, Inc.
    44 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    … …  
    2323 *
    2424 */
     25
     26#ifndef CPU_ZERO_VM_STUBROUTINES_ZERO_HPP
     27#define CPU_ZERO_VM_STUBROUTINES_ZERO_HPP
    2528
    2629  // This file holds the platform specific parts of the StubRoutines
    … …  
    5457  };
    5558#endif // IA32
     59
     60#endif // CPU_ZERO_VM_STUBROUTINES_ZERO_HPP

  • trunk/openjdk/hotspot/src/cpu/zero/vm/templateInterpreterGenerator_zero.hpp

    r278 r309  
    11/*
    2  * Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved.
     2 * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
    33 * Copyright 2009 Red Hat, Inc.
    44 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    … …  
    2424 */
    2525
     26#ifndef CPU_ZERO_VM_TEMPLATEINTERPRETERGENERATOR_ZERO_HPP
     27#define CPU_ZERO_VM_TEMPLATEINTERPRETERGENERATOR_ZERO_HPP
     28
    2629// This file is intentionally empty
     30
     31#endif // CPU_ZERO_VM_TEMPLATEINTERPRETERGENERATOR_ZERO_HPP

  • trunk/openjdk/hotspot/src/cpu/zero/vm/templateInterpreter_zero.cpp

    r278 r309  
    11/*
    2  * Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved.
     2 * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
    33 * Copyright 2009 Red Hat, Inc.
    44 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    … …  
    2424 */
    2525
     26#include "precompiled.hpp"
     27#include "asm/assembler.hpp"
     28#include "interpreter/bytecodeHistogram.hpp"
     29#include "interpreter/interpreter.hpp"
     30#include "interpreter/interpreterGenerator.hpp"
     31#include "interpreter/interpreterRuntime.hpp"
     32#include "interpreter/templateTable.hpp"
     33#include "oops/arrayOop.hpp"
     34#include "oops/methodDataOop.hpp"
     35#include "oops/methodOop.hpp"
     36#include "oops/oop.inline.hpp"
     37#include "prims/jvmtiExport.hpp"
     38#include "prims/jvmtiThreadState.hpp"
     39#include "runtime/arguments.hpp"
     40#include "runtime/deoptimization.hpp"
     41#include "runtime/frame.inline.hpp"
     42#include "runtime/sharedRuntime.hpp"
     43#include "runtime/stubRoutines.hpp"
     44#include "runtime/synchronizer.hpp"
     45#include "runtime/timer.hpp"
     46#include "runtime/vframeArray.hpp"
     47#include "utilities/debug.hpp"
     48
    2649// This file is intentionally empty

  • trunk/openjdk/hotspot/src/cpu/zero/vm/templateInterpreter_zero.hpp

    r278 r309  
    11/*
    2  * Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved.
     2 * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
    33 * Copyright 2009 Red Hat, Inc.
    44 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    … …  
    2424 */
    2525
     26#ifndef CPU_ZERO_VM_TEMPLATEINTERPRETER_ZERO_HPP
     27#define CPU_ZERO_VM_TEMPLATEINTERPRETER_ZERO_HPP
     28
    2629// This file is intentionally empty
     30
     31#endif // CPU_ZERO_VM_TEMPLATEINTERPRETER_ZERO_HPP

  • trunk/openjdk/hotspot/src/cpu/zero/vm/templateTable_zero.cpp

    r278 r309  
    11/*
    2  * Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved.
     2 * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
    33 * Copyright 2009 Red Hat, Inc.
    44 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    … …  
    2424 */
    2525
     26#include "precompiled.hpp"
     27#include "interpreter/interpreter.hpp"
     28#include "interpreter/interpreterRuntime.hpp"
     29#include "interpreter/templateTable.hpp"
     30#include "memory/universe.inline.hpp"
     31#include "oops/methodDataOop.hpp"
     32#include "oops/objArrayKlass.hpp"
     33#include "oops/oop.inline.hpp"
     34#include "prims/methodHandles.hpp"
     35#include "runtime/sharedRuntime.hpp"
     36#include "runtime/stubRoutines.hpp"
     37#include "runtime/synchronizer.hpp"
     38
    2639// This file is intentionally empty

  • trunk/openjdk/hotspot/src/cpu/zero/vm/templateTable_zero.hpp

    r278 r309  
    11/*
    2  * Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved.
     2 * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
    33 * Copyright 2009 Red Hat, Inc.
    44 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    … …  
    2424 */
    2525
     26#ifndef CPU_ZERO_VM_TEMPLATETABLE_ZERO_HPP
     27#define CPU_ZERO_VM_TEMPLATETABLE_ZERO_HPP
     28
    2629// This file is intentionally empty
     30
     31#endif // CPU_ZERO_VM_TEMPLATETABLE_ZERO_HPP

  • trunk/openjdk/hotspot/src/cpu/zero/vm/vmStructs_zero.hpp

    r278 r309  
    11/*
    2  * Copyright (c) 2003, 2007, Oracle and/or its affiliates. All rights reserved.
     2 * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
    33 * Copyright 2007 Red Hat, Inc.
    44 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    … …  
    2323 *
    2424 */
     25
     26#ifndef CPU_ZERO_VM_VMSTRUCTS_ZERO_HPP
     27#define CPU_ZERO_VM_VMSTRUCTS_ZERO_HPP
    2528
    2629// These are the CPU-specific fields, types and integer
    … …  
    5154  /* in vmStructs_<os>_<cpu>.hpp's VM_LONG_CONSTANTS_OS_CPU macro (and must  */
    5255  /* be present there)                                                       */
     56
     57#endif // CPU_ZERO_VM_VMSTRUCTS_ZERO_HPP

  • trunk/openjdk/hotspot/src/cpu/zero/vm/vm_version_zero.cpp

    r278 r309  
    11/*
    2  * Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved.
     2 * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
    33 * Copyright 2009 Red Hat, Inc.
    44 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    … …  
    2424 */
    2525
     26#include "precompiled.hpp"
     27#include "assembler_zero.inline.hpp"
     28#include "memory/resourceArea.hpp"
     29#include "runtime/java.hpp"
     30#include "runtime/stubCodeGenerator.hpp"
     31#include "vm_version_zero.hpp"
     32#ifdef TARGET_OS_FAMILY_linux
     33# include "os_linux.inline.hpp"
     34#endif
     35
    2636// This file is intentionally empty

  • trunk/openjdk/hotspot/src/cpu/zero/vm/vm_version_zero.hpp

    r278 r309  
    11/*
    2  * Copyright (c) 2003, 2006, Oracle and/or its affiliates. All rights reserved.
     2 * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
    33 * Copyright 2007 Red Hat, Inc.
    44 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    … …  
    2424 */
    2525
     26#ifndef CPU_ZERO_VM_VM_VERSION_ZERO_HPP
     27#define CPU_ZERO_VM_VM_VERSION_ZERO_HPP
     28
     29#include "runtime/globals_extension.hpp"
     30#include "runtime/vm_version.hpp"
     31
    2632class VM_Version : public Abstract_VM_Version {
    2733 public:
    … …  
    3036  }
    3137};
     38
     39#endif // CPU_ZERO_VM_VM_VERSION_ZERO_HPP

  • trunk/openjdk/hotspot/src/cpu/zero/vm/vmreg_zero.cpp

    r278 r309  
    11/*
    2  * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
     2 * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
    33 * Copyright 2007 Red Hat, Inc.
    44 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    … …  
    2424 */
    2525
    26 #include "incls/_precompiled.incl"
    27 #include "incls/_vmreg_zero.cpp.incl"
     26#include "precompiled.hpp"
     27#include "asm/assembler.hpp"
     28#include "code/vmreg.hpp"
    2829
    2930void VMRegImpl::set_regName() {

  • trunk/openjdk/hotspot/src/cpu/zero/vm/vmreg_zero.hpp

    r278 r309  
    11/*
    2  * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
     2 * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
    33 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44 *
    … …  
    2323 */
    2424
     25#ifndef CPU_ZERO_VM_VMREG_ZERO_HPP
     26#define CPU_ZERO_VM_VMREG_ZERO_HPP
     27
    2528  bool is_Register();
    2629  Register as_Register();
    … …  
    2831  bool is_FloatRegister();
    2932  FloatRegister as_FloatRegister();
     33
     34#endif // CPU_ZERO_VM_VMREG_ZERO_HPP

  • trunk/openjdk/hotspot/src/cpu/zero/vm/vmreg_zero.inline.hpp

    r278 r309  
    11/*
    2  * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
     2 * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
    33 * Copyright 2007 Red Hat, Inc.
    44 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    … …  
    2424 */
    2525
     26#ifndef CPU_ZERO_VM_VMREG_ZERO_INLINE_HPP
     27#define CPU_ZERO_VM_VMREG_ZERO_INLINE_HPP
     28
    2629inline VMReg RegisterImpl::as_VMReg() {
    2730  return VMRegImpl::as_VMReg(encoding());
    … …  
    3134  return VMRegImpl::as_VMReg(encoding() + ConcreteRegisterImpl::max_gpr);
    3235}
     36
     37#endif // CPU_ZERO_VM_VMREG_ZERO_INLINE_HPP

  • trunk/openjdk/hotspot/src/cpu/zero/vm/vtableStubs_zero.cpp

    r278 r309  
    11/*
    2  * Copyright (c) 2003, 2006, Oracle and/or its affiliates. All rights reserved.
     2 * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
    33 * Copyright 2007 Red Hat, Inc.
    44 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    … …  
    2424 */
    2525
    26 #include "incls/_precompiled.incl"
    27 #include "incls/_vtableStubs_zero.cpp.incl"
     26#include "precompiled.hpp"
     27#include "asm/assembler.hpp"
     28#include "assembler_zero.inline.hpp"
     29#include "code/vtableStubs.hpp"
     30#include "interp_masm_zero.hpp"
     31#include "memory/resourceArea.hpp"
     32#include "oops/instanceKlass.hpp"
     33#include "oops/klassVtable.hpp"
     34#include "runtime/sharedRuntime.hpp"
     35#include "vmreg_zero.inline.hpp"
     36#ifdef COMPILER2
     37#include "opto/runtime.hpp"
     38#endif
    2839
    2940VtableStub* VtableStubs::create_vtable_stub(int vtable_index) {
Note: See TracChangeset for help on using the changeset viewer.