hotspot/src/os_cpu/windows_x86/vm/os_windows_x86.cpp

rev 611 : Merge

*** 1,10 ****
- #ifdef USE_PRAGMA_IDENT_SRC
- #pragma ident "@(#)os_windows_x86.cpp   1.32 07/09/17 09:11:33 JVM"
- #endif
  /*
!  * Copyright 1999-2007 Sun Microsystems, Inc.  All Rights Reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
--- 1,7 ----
  /*
!  * Copyright 1999-2008 Sun Microsystems, Inc.  All Rights Reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
*** 48,58 ****
    __try {
  
  #ifndef AMD64
      // We store the current thread in this wrapperthread location
      // and determine how far away this address is from the structured
!     // execption pointer that FS:[0] points to.  This get_thread 
      // code can then get the thread pointer via FS.
      // 
      // Warning:  This routine must NEVER be inlined since we'd end up with
      //           multiple offsets.
      //
--- 45,55 ----
    __try {
  
  #ifndef AMD64
      // We store the current thread in this wrapperthread location
      // and determine how far away this address is from the structured
!     // exception pointer that FS:[0] points to.  This get_thread
      // code can then get the thread pointer via FS.
      //
      // Warning:  This routine must NEVER be inlined since we'd end up with
      //           multiple offsets.
      //
*** 370,380 ****
  
  #ifdef AMD64
    // apparently _asm not supported on windows amd64
    typedef intptr_t*      get_fp_func           ();
    get_fp_func* func = CAST_TO_FN_PTR(get_fp_func*,
!                                      StubRoutines::amd64::get_previous_fp_entry());
    if (func == NULL) return frame(NULL, NULL, NULL);
    intptr_t* fp = (*func)();
  #else
    intptr_t* fp = _get_previous_fp();
  #endif // AMD64
--- 367,377 ----
  
  #ifdef AMD64
    // apparently _asm not supported on windows amd64
    typedef intptr_t*      get_fp_func           ();
    get_fp_func* func = CAST_TO_FN_PTR(get_fp_func*,
!                                      StubRoutines::x86::get_previous_fp_entry());
    if (func == NULL) return frame(NULL, NULL, NULL);
    intptr_t* fp = (*func)();
  #else
    intptr_t* fp = _get_previous_fp();
  #endif // AMD64
*** 477,482 ****
  #ifndef AMD64
    int fpu_cntrl_word = StubRoutines::fpu_cntrl_wrd_std();
    __asm fldcw fpu_cntrl_word;
  #endif // !AMD64
  }
- 
--- 474,478 ----