# HG changeset patch # User Doug Simon # Date 1386169290 -3600 # Node ID af7d328b2cc72ae7f9dad3d8f13169e768533985 # Parent 6140eda73e6fc03c895baf792e2d25db06efc5e3 minor renamings diff -r 6140eda73e6f -r af7d328b2cc7 graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotBackend.java --- 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); }