comparison graal/com.oracle.graal.lir/src/com/oracle/graal/lir/asm/CompilationResultBuilder.java @ 21543:93c50cefb9e8

moved GraalInternalError to com.oracle.jvmci.common and renamed it to JVMCIError (JBS:GRAAL-53)
author Doug Simon <doug.simon@oracle.com>
date Mon, 25 May 2015 23:30:34 +0200
parents 257fd6a46525
children b1530a6cce8c
comparison
equal deleted inserted replaced
21542:543957c1c6a6 21543:93c50cefb9e8
31 import com.oracle.graal.api.code.CompilationResult.DataSectionReference; 31 import com.oracle.graal.api.code.CompilationResult.DataSectionReference;
32 import com.oracle.graal.api.code.DataSection.Data; 32 import com.oracle.graal.api.code.DataSection.Data;
33 import com.oracle.graal.api.code.DataSection.DataBuilder; 33 import com.oracle.graal.api.code.DataSection.DataBuilder;
34 import com.oracle.graal.api.meta.*; 34 import com.oracle.graal.api.meta.*;
35 import com.oracle.graal.asm.*; 35 import com.oracle.graal.asm.*;
36 import com.oracle.graal.compiler.common.*;
37 import com.oracle.graal.compiler.common.cfg.*; 36 import com.oracle.graal.compiler.common.cfg.*;
38 import com.oracle.graal.debug.*; 37 import com.oracle.graal.debug.*;
39 import com.oracle.graal.lir.*; 38 import com.oracle.graal.lir.*;
40 import com.oracle.graal.lir.framemap.*; 39 import com.oracle.graal.lir.framemap.*;
41 import com.oracle.graal.options.*; 40 import com.oracle.graal.options.*;
41 import com.oracle.jvmci.common.*;
42 42
43 /** 43 /**
44 * Fills in a {@link CompilationResult} as its code is being assembled. 44 * Fills in a {@link CompilationResult} as its code is being assembled.
45 * 45 *
46 * @see CompilationResultBuilderFactory 46 * @see CompilationResultBuilderFactory
212 assert (value.getKind().isNumericInteger()) && isConstant(value); 212 assert (value.getKind().isNumericInteger()) && isConstant(value);
213 JavaConstant constant = (JavaConstant) value; 213 JavaConstant constant = (JavaConstant) value;
214 assert !codeCache.needsDataPatch(constant) : constant + " should be in a DataPatch"; 214 assert !codeCache.needsDataPatch(constant) : constant + " should be in a DataPatch";
215 long c = constant.asLong(); 215 long c = constant.asLong();
216 if (!NumUtil.isInt(c)) { 216 if (!NumUtil.isInt(c)) {
217 throw GraalInternalError.shouldNotReachHere(); 217 throw JVMCIError.shouldNotReachHere();
218 } 218 }
219 return (int) c; 219 return (int) c;
220 } 220 }
221 221
222 /** 222 /**
368 blockComment(String.format("%d %s", op.id(), op)); 368 blockComment(String.format("%d %s", op.id(), op));
369 } 369 }
370 370
371 try { 371 try {
372 emitOp(this, op); 372 emitOp(this, op);
373 } catch (GraalInternalError e) { 373 } catch (JVMCIError e) {
374 throw e.addContext("lir instruction", block + "@" + op.id() + " " + op + "\n" + lir.codeEmittingOrder()); 374 throw e.addContext("lir instruction", block + "@" + op.id() + " " + op + "\n" + lir.codeEmittingOrder());
375 } 375 }
376 } 376 }
377 } 377 }
378 378
379 private static void emitOp(CompilationResultBuilder crb, LIRInstruction op) { 379 private static void emitOp(CompilationResultBuilder crb, LIRInstruction op) {
380 try { 380 try {
381 op.emitCode(crb); 381 op.emitCode(crb);
382 } catch (AssertionError t) { 382 } catch (AssertionError t) {
383 throw new GraalInternalError(t); 383 throw new JVMCIError(t);
384 } catch (RuntimeException t) { 384 } catch (RuntimeException t) {
385 throw new GraalInternalError(t); 385 throw new JVMCIError(t);
386 } 386 }
387 } 387 }
388 388
389 public void reset() { 389 public void reset() {
390 asm.reset(); 390 asm.reset();