hotspot/src/cpu/x86/vm/relocInfo_x86.hpp

rev 611 : Merge

*** 1,10 ****
- #ifdef USE_PRAGMA_IDENT_HDR
- #pragma ident "@(#)relocInfo_x86.hpp    1.18 07/05/05 17:04:19 JVM"
- #endif
  /*
!  * Copyright 1997-1999 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 1997-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.
*** 30,36 ****
--- 27,38 ----
    enum {
      // Intel instructions are byte-aligned.
      offset_unit        =  1,
  
      // Encodes Assembler::disp32_operand vs. Assembler::imm32_operand.
+ #ifndef AMD64
      format_width       =  1
+ #else
+     // vs Assembler::narrow_oop_operand.
+     format_width       =  2
+ #endif
    };