Mercurial > hg > truffle

changeset 13245:af7d328b2cc7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
minor renamings
author Doug Simon <doug.simon@oracle.com>
date Wed, 04 Dec 2013 16:01:30 +0100
parents 6140eda73e6f
children 0909754d87f4
files graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotBackend.java
diffstat 1 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotBackend.java	Wed Dec 04 16:01:14 2013 +0100
+++ b/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotBackend.java	Wed Dec 04 16:01:30 2013 +0100
@@ -109,7 +109,7 @@
      * The size of the instruction used to patch the verified entry point of an nmethod when the
      * nmethod is made non-entrant or a zombie (e.g. during deopt or class unloading). The first
      * instruction emitted at an nmethod's verified entry point must be at least this length to
-     * ensure mp-safe patching.
+     * ensure mt-safe patching.
      */
     public static final int PATCHED_VERIFIED_ENTRY_POINT_INSTRUCTION_SIZE = 5;
 
@@ -228,10 +228,10 @@
         FrameMap frameMap = crb.frameMap;
         RegisterConfig regConfig = frameMap.registerConfig;
         HotSpotVMConfig config = getRuntime().getConfig();
-        Label verifiedStub = new Label();
+        Label verifiedEntry = new Label();
 
         // Emit the prefix
-        emitCodePrefix(installedCodeOwner, crb, asm, regConfig, config, verifiedStub);
+        emitCodePrefix(installedCodeOwner, crb, asm, regConfig, config, verifiedEntry);
 
         // Emit code for the LIR
         emitCodeBody(installedCodeOwner, crb, lirGen);
@@ -245,7 +245,7 @@
      * 
      * @param installedCodeOwner see {@link Backend#emitCode}
      */
-    public void emitCodePrefix(ResolvedJavaMethod installedCodeOwner, CompilationResultBuilder crb, AMD64MacroAssembler asm, RegisterConfig regConfig, HotSpotVMConfig config, Label verifiedStub) {
+    public void emitCodePrefix(ResolvedJavaMethod installedCodeOwner, CompilationResultBuilder crb, AMD64MacroAssembler asm, RegisterConfig regConfig, HotSpotVMConfig config, Label verifiedEntry) {
         HotSpotProviders providers = getProviders();
         if (installedCodeOwner != null && !isStatic(installedCodeOwner.getModifiers())) {
             crb.recordMark(Marks.MARK_UNVERIFIED_ENTRY);
@@ -268,7 +268,7 @@
 
         asm.align(config.codeEntryAlignment);
         crb.recordMark(Marks.MARK_OSR_ENTRY);
-        asm.bind(verifiedStub);
+        asm.bind(verifiedEntry);
         crb.recordMark(Marks.MARK_VERIFIED_ENTRY);
     }