hotspot/src/cpu/x86/vm/icache_x86.cpp

rev 611 : Merge

*** 1,10 ****
- #ifdef USE_PRAGMA_IDENT_SRC
- #pragma ident "@(#)icache_x86.cpp       1.22 07/09/17 09:33:47 JVM"
- #endif
  /*
!  * Copyright 1997-2004 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.
*** 49,59 ****
    // Other fence and sync instructions won't do the job.
    __ mfence();
  
    __ bind(flush_line);
    __ clflush(Address(addr, 0));
!   __ addq(addr, ICache::line_size);
    __ decrementl(lines);
    __ jcc(Assembler::notZero, flush_line);
  
    __ mfence();
  
--- 46,56 ----
    // Other fence and sync instructions won't do the job.
    __ mfence();
  
    __ bind(flush_line);
    __ clflush(Address(addr, 0));
!   __ addptr(addr, ICache::line_size);
    __ decrementl(lines);
    __ jcc(Assembler::notZero, flush_line);
  
    __ mfence();
  
*** 61,71 ****
  
  #else
    const Address magic(rsp, 3*wordSize);
    __ lock(); __ addl(Address(rsp, 0), 0);
  #endif // AMD64
!   __ movl(rax, magic); // Handshake with caller to make sure it happened!
    __ ret(0);
  
    // Must be set here so StubCodeMark destructor can call the flush stub.
    *flush_icache_stub = (ICache::flush_icache_stub_t)start;
  }
--- 58,68 ----
  
  #else
    const Address magic(rsp, 3*wordSize);
    __ lock(); __ addl(Address(rsp, 0), 0);
  #endif // AMD64
!   __ movptr(rax, magic); // Handshake with caller to make sure it happened!
    __ ret(0);
  
    // Must be set here so StubCodeMark destructor can call the flush stub.
    *flush_icache_stub = (ICache::flush_icache_stub_t)start;
  }