Changeset 317


Ignore:
Timestamp:
Feb 16, 2012, 1:01:21 PM (13 years ago)
Author:
dmik
Message:

Use TARGET_OS_FAMILY_windows instead of _WINDOWS when appropriate.

This is cleaner and also makes this code used on OS/2 w/o any extra defines.

Location:
trunk/openjdk/hotspot/src
Files:
13 edited

Legend:

Unmodified
Added
Removed

  • trunk/openjdk/hotspot/src/cpu/x86/vm/jniFastGetField_x86_32.cpp

    r309 r317  
    3434#define BUFFER_SIZE 30
    3535
    36 #if defined(_WINDOWS) || defined(OS2)
     36#ifdef TARGET_OS_FAMILY_windows
    3737GetBooleanField_t JNI_FastGetField::jni_fast_GetBooleanField_fp;
    3838GetByteField_t    JNI_FastGetField::jni_fast_GetByteField_fp;
    … …  
    114114  __ jcc (Assembler::notEqual, slow);
    115115
    116 #if !defined(_WINDOWS) && !defined(__WIN32OS2__)
     116#ifndef TARGET_OS_FAMILY_windows
    117117  __ ret (0);
    118118#else
    … …  
    136136  __ flush ();
    137137
    138 #if !defined(_WINDOWS) && !defined(OS2)
     138#ifndef TARGET_OS_FAMILY_windows
    139139  return fast_entry;
    140140#else
    … …  
    231231  __ pop (rsi);
    232232
    233 #if !defined(_WINDOWS) && !defined(__WIN32OS2__)
     233#ifndef TARGET_OS_FAMILY_windows
    234234  __ ret (0);
    235235#else
    … …  
    248248  __ flush ();
    249249
    250 #if !defined(_WINDOWS) && !defined(OS2)
     250#ifndef TARGET_OS_FAMILY_windows
    251251  return fast_entry;
    252252#else
    … …  
    325325  __ jcc (Assembler::notEqual, slow_with_pop);
    326326
    327 #if !defined(_WINDOWS) && !defined(__WIN32OS2__)
     327#ifndef TARGET_OS_FAMILY_windows
    328328  __ ret (0);
    329329#else
    … …  
    349349  __ flush ();
    350350
    351 #if !defined(_WINDOWS) && !defined(OS2)
     351#ifndef TARGET_OS_FAMILY_windows
    352352  return fast_entry;
    353353#else

  • trunk/openjdk/hotspot/src/share/vm/prims/forte.cpp

    r309 r317  
    631631
    632632
    633 #if !defined(_WINDOWS) && !defined(OS2)
     633#ifndef TARGET_OS_FAMILY_windows
    634634// Support for the Forte(TM) Peformance Tools collector.
    635635//
    … …  
    650650#define collector_func_load(x0,x1,x2,x3,x4,x5,x6) \
    651651        ( collector_func_load ? collector_func_load(x0,x1,x2,x3,x4,x5,x6),0 : 0 )
    652 #endif // !_WINDOWS && !OS2
     652#endif // !TARGET_OS_FAMILY_windows
    653653
    654654} // end extern "C"
    … …  
    656656
    657657void Forte::register_stub(const char* name, address start, address end) {
    658 #if !defined(_WINDOWS) && !defined(OS2) && !defined(IA64)
     658#if !defined(TARGET_OS_FAMILY_windows) && !defined(IA64)
    659659  assert(pointer_delta(end, start, sizeof(jbyte)) < INT_MAX,
    660660         "Code size exceeds maximum range");
    … …  
    662662  collector_func_load((char*)name, NULL, NULL, start,
    663663    pointer_delta(end, start, sizeof(jbyte)), 0, NULL);
    664 #endif // !_WINDOWS && !OS2 && !IA64
    665 }
     664#endif // !TARGET_OS_FAMILY_windows && !IA64
     665}

  • trunk/openjdk/hotspot/src/share/vm/prims/jni.cpp

    r309 r317  
    31863186  if (UseFastJNIAccessors && !JvmtiExport::can_post_field_access()
    31873187      && !VerifyJNIFields && !TraceJNICalls && !CountJNICalls && !CheckJNICalls
    3188 #if defined(_WINDOWS) && defined(IA32) && defined(COMPILER2)
     3188#if defined(TARGET_OS_FAMILY_windows) && defined(IA32) && defined(COMPILER2)
    31893189      // windows x86 currently needs SEH wrapper and the gain of the fast
    31903190      // versions currently isn't certain for server vm on uniprocessor.

  • trunk/openjdk/hotspot/src/share/vm/prims/jniFastGetField.hpp

    r309 r317  
    6767
    6868 public:
    69 #if (defined(_WINDOWS) && !defined(_WIN64)) || defined(OS2)
     69#ifdef TARGET_OS_ARCH_MODEL_windows_x86_32
    7070  static GetBooleanField_t jni_fast_GetBooleanField_fp;
    7171  static GetByteField_t    jni_fast_GetByteField_fp;

  • trunk/openjdk/hotspot/src/share/vm/runtime/vmStructs.cpp

    r309 r317  
    23462346  // Solstice NFS setup. If everyone switches to local workspaces on
    23472347  // Win32, we can put this back in.
    2348 #ifndef _WINDOWS
     2348#ifndef TARGET_OS_FAMILY_windows
    23492349  debug_only(VM_STRUCTS(ENSURE_FIELD_TYPE_PRESENT, \
    23502350                        CHECK_NO_OP, \

  • trunk/openjdk/hotspot/src/share/vm/utilities/decoder.cpp

    r309 r317  
    3030bool                     Decoder::_initialized = false;
    3131
    32 #ifndef _WINDOWS
     32#ifndef TARGET_OS_FAMILY_windows
    3333
    3434// Implementation of common functionalities among Solaris and Linux

  • trunk/openjdk/hotspot/src/share/vm/utilities/decoder.hpp

    r309 r317  
    2929#include "memory/allocation.hpp"
    3030
    31 #ifdef _WINDOWS
     31#ifdef TARGET_OS_FAMILY_windows
    3232#include <windows.h>
    3333#include <imagehlp.h>
    … …  
    4343class ElfFile;
    4444
    45 #endif // _WINDOWS
     45#endif // TARGET_OS_FAMILY_windows
    4646
    4747
    … …  
    7070  static void uninitialize();
    7171
    72 #ifdef _WINDOWS
     72#ifdef TARGET_OS_FAMILY_windows
    7373  static decoder_status    decode(address addr, char *buf, int buflen, int *offset);
    7474#else
    … …  
    8080  static decoder_status    get_status() { return _decoder_status; };
    8181
    82 #ifndef _WINDOWS
     82#ifndef TARGET_OS_FAMILY_windows
    8383 private:
    8484  static ElfFile*         get_elf_file(const char* filepath);
    85 #endif // _WINDOWS
     85#endif // TARGET_OS_FAMILY_windows
    8686
    8787
    … …  
    9090  static bool               _initialized;
    9191
    92 #ifdef _WINDOWS
     92#ifdef TARGET_OS_FAMILY_windows
    9393  static HMODULE                   _dbghelp_handle;
    9494  static bool                      _can_decode_in_vm;
    … …  
    9797#else
    9898  static ElfFile*                  _opened_elf_files;
    99 #endif // _WINDOWS
     99#endif // TARGET_OS_FAMILY_windows
    100100};
    101101

  • trunk/openjdk/hotspot/src/share/vm/utilities/elfFile.cpp

    r309 r317  
    2525#include "precompiled.hpp"
    2626
    27 #ifndef _WINDOWS
     27#ifndef TARGET_OS_FAMILY_windows
    2828
    2929#include <string.h>
    … …  
    196196}
    197197
    198 #endif // _WINDOWS
     198#endif // TARGET_OS_FAMILY_windows

  • trunk/openjdk/hotspot/src/share/vm/utilities/elfFile.hpp

    r309 r317  
    2626#define __ELF_FILE_HPP
    2727
    28 #ifndef _WINDOWS
     28#ifndef TARGET_OS_FAMILY_windows
    2929
    3030#include <elf.h>
    … …  
    135135};
    136136
    137 #endif // _WINDOWS
     137#endif // TARGET_OS_FAMILY_windows
    138138
    139139#endif // __ELF_FILE_HPP

  • trunk/openjdk/hotspot/src/share/vm/utilities/elfStringTable.cpp

    r309 r317  
    2525#include "precompiled.hpp"
    2626
    27 #ifndef _WINDOWS
     27#ifndef TARGET_OS_FAMILY_windows
    2828
    2929#include "memory/allocation.inline.hpp"
    … …  
    8686}
    8787
    88 #endif // _WINDOWS
     88#endif // TARGET_OS_FAMILY_windows
    8989

  • trunk/openjdk/hotspot/src/share/vm/utilities/elfStringTable.hpp

    r309 r317  
    2626#define __ELF_STRING_TABLE_HPP
    2727
    28 #ifndef _WINDOWS
     28#ifndef TARGET_OS_FAMILY_windows
    2929
    3030#include "memory/allocation.hpp"
    … …  
    7777};
    7878
    79 #endif // _WINDOWS
     79#endif // TARGET_OS_FAMILY_windows
    8080
    8181#endif // __ELF_STRING_TABLE_HPP

  • trunk/openjdk/hotspot/src/share/vm/utilities/elfSymbolTable.cpp

    r309 r317  
    2525#include "precompiled.hpp"
    2626
    27 #ifndef _WINDOWS
     27#ifndef TARGET_OS_FAMILY_windows
    2828
    2929#include "memory/allocation.inline.hpp"
    … …  
    123123}
    124124
    125 #endif // _WINDOWS
     125#endif // TARGET_OS_FAMILY_windows

  • trunk/openjdk/hotspot/src/share/vm/utilities/elfSymbolTable.hpp

    r309 r317  
    2626#define __ELF_SYMBOL_TABLE_HPP
    2727
    28 #ifndef _WINDOWS
     28#ifndef TARGET_OS_FAMILY_windows
    2929
    3030
    … …  
    6666};
    6767
    68 #endif // _WINDOWS
     68#endif // TARGET_OS_FAMILY_windows
    6969
    7070#endif // __ELF_SYMBOL_TABLE_HPP
Note: See TracChangeset for help on using the changeset viewer.