*** old/src/cpu/x86/vm/assembler_x86_64.hpp	Mon May 19 21:11:11 2008
--- new/src/cpu/x86/vm/assembler_x86_64.hpp	Mon May 19 21:11:10 2008

*** 488,498 ****
--- 488,503 ----
    enum WhichOperand {
      // input to locate_operand, and format code for relocations
      imm64_operand  = 0,          // embedded 64-bit immediate operand
      disp32_operand = 1,          // embedded 32-bit displacement
      call32_operand = 2,          // embedded 32-bit self-relative displacement
+ #ifndef AMD64
      _WhichOperand_limit = 3
+ #else
+      narrow_oop_operand = 3,     // embedded 32-bit immediate narrow oop
+     _WhichOperand_limit = 4
+ #endif
    };
  
    public:
  
    // Creation

*** 1112,1121 ****
--- 1117,1128 ----
    void encode_heap_oop_not_null(Register r);
    void decode_heap_oop_not_null(Register r);
    void encode_heap_oop_not_null(Register dst, Register src);
    void decode_heap_oop_not_null(Register dst, Register src);
  
+   void set_narrow_oop(Register dst, jobject obj);
+ 
    // Stack frame creation/removal
    void enter();
    void leave();
  
    // Support for getting the JavaThread pointer (i.e.; a reference to