now each handler has an inline and prelude section so exception handlers run properly

This commit is contained in:
Parker TenBroeck 2025-05-01 11:03:26 -04:00
parent 8593eada03
commit 1e1b1beadf
7 changed files with 199 additions and 146 deletions

View file

@ -20,64 +20,64 @@ public class GenSMBuilder extends StateMachineBuilder {
public final static MethodTypeDesc MTD_Gen = MethodTypeDesc.of(CD_Gen);
public final static MethodTypeDesc MTD_Obj = MethodTypeDesc.of(ConstantDescs.CD_Object);
static class YieldHandler extends SpecialMethodHandler {
final int resume_state;
final Label resume_label;
final boolean is_void;
public YieldHandler(StateMachineBuilder smb, CodeBuilder cob, boolean is_void) {
super(smb, cob);
resume_state = smb.add_state(resume_label = cob.newLabel());
this.is_void = is_void;
}
public ReplacementKind replacementKind(){return ReplacementKind.ImmediateReplacingPop;}
@Override
public void buildHandler(StateMachineBuilder smb, CodeBuilder cob, Frame frame) {
if(is_void)cob.aconst_null();
// smb.lt.savingLocals(smb.CD_this, cob, () -> {
// cob.aload(0).loadConstant(resume_state).putfield(smb.CD_this, STATE_NAME, TypeKind.INT.upperBound())
// .new_(CD_Yield)
// .dup_x1()
// .swap()
// .invokespecial(CD_Yield, ConstantDescs.INIT_NAME, MethodTypeDesc.of(ConstantDescs.CD_void, ConstantDescs.CD_Object))
// .areturn();
// cob.labelBinding(resume_label);
// });
}
}
static class RetHandler extends SpecialMethodHandler {
final boolean is_void;
public RetHandler(StateMachineBuilder smb, CodeBuilder cob, boolean is_void) {
super(smb, cob);
this.is_void = is_void;
}
public ReplacementKind replacementKind(){return ReplacementKind.ReplacingNextReturn;}
@Override
public void buildHandler(StateMachineBuilder smb, CodeBuilder cob, Frame frame) {
if(is_void)cob.aconst_null();
cob.aload(0).loadConstant(-1).putfield(smb.CD_this, STATE_NAME, TypeKind.INT.upperBound())
.new_(CD_Ret)
.dup_x1()
.swap()
.invokespecial(CD_Ret, ConstantDescs.INIT_NAME, MethodTypeDesc.of(ConstantDescs.CD_void, ConstantDescs.CD_Object))
.areturn();
}
}
// static class YieldHandler extends SpecialMethodHandler {
// final int resume_state;
// final Label resume_label;
// final boolean is_void;
//
// public YieldHandler(StateMachineBuilder smb, CodeBuilder cob, boolean is_void) {
// super(smb, cob);
// resume_state = smb.add_state(resume_label = cob.newLabel());
// this.is_void = is_void;
// }
//
// public ReplacementKind replacementKind(){return ReplacementKind.ImmediateReplacingPop;}
//
// @Override
// public void build_prelude(StateMachineBuilder smb, CodeBuilder cob, Frame frame) {
// if(is_void)cob.aconst_null();
//
//// smb.lt.savingLocals(smb.CD_this, cob, () -> {
//// cob.aload(0).loadConstant(resume_state).putfield(smb.CD_this, STATE_NAME, TypeKind.INT.upperBound())
//// .new_(CD_Yield)
//// .dup_x1()
//// .swap()
//// .invokespecial(CD_Yield, ConstantDescs.INIT_NAME, MethodTypeDesc.of(ConstantDescs.CD_void, ConstantDescs.CD_Object))
//// .areturn();
//// cob.labelBinding(resume_label);
//// });
// }
// }
//
// static class RetHandler extends SpecialMethodHandler {
// final boolean is_void;
//
// public RetHandler(StateMachineBuilder smb, CodeBuilder cob, boolean is_void) {
// super(smb, cob);
// this.is_void = is_void;
// }
//
// public ReplacementKind replacementKind(){return ReplacementKind.ReplacingNextReturn;}
//
// @Override
// public void build_prelude(StateMachineBuilder smb, CodeBuilder cob, Frame frame) {
// if(is_void)cob.aconst_null();
//
// cob.aload(0).loadConstant(-1).putfield(smb.CD_this, STATE_NAME, TypeKind.INT.upperBound())
// .new_(CD_Ret)
// .dup_x1()
// .swap()
// .invokespecial(CD_Ret, ConstantDescs.INIT_NAME, MethodTypeDesc.of(ConstantDescs.CD_void, ConstantDescs.CD_Object))
// .areturn();
// }
// }
public GenSMBuilder(ClassModel src_clm, MethodModel src_mem, CodeModel src_com) {
super(src_clm, src_mem, src_com);
smmap.put(new SpecialMethod(CD_Gen, "yield", MTD_Gen_Obj),(smb, cob) -> new YieldHandler(smb, cob, false));
smmap.put(new SpecialMethod(CD_Gen, "yield", MTD_Gen),(smb, cob) -> new YieldHandler(smb, cob, true));
smmap.put(new SpecialMethod(CD_Gen, "ret", MTD_Gen_Obj),(smb, cob) -> new RetHandler(smb, cob, false));
smmap.put(new SpecialMethod(CD_Gen, "ret", MTD_Gen),(smb, cob) -> new RetHandler(smb, cob, true));
// smmap.put(new SpecialMethod(CD_Gen, "yield", MTD_Gen_Obj),(smb, cob) -> new YieldHandler(smb, cob, false));
// smmap.put(new SpecialMethod(CD_Gen, "yield", MTD_Gen),(smb, cob) -> new YieldHandler(smb, cob, true));
// smmap.put(new SpecialMethod(CD_Gen, "ret", MTD_Gen_Obj),(smb, cob) -> new RetHandler(smb, cob, false));
// smmap.put(new SpecialMethod(CD_Gen, "ret", MTD_Gen),(smb, cob) -> new RetHandler(smb, cob, true));
}
@Override