vuminh224/tp2-vsl-pds
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

maj SymTable (id global) + DeclGlobal

Browse Source
This commit is contained in:
trochas
2025-04-28 17:20:15 +02:00
parent 1b5dd97226
commit 79920ed4d4
6 changed files with 108 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
src/main/java/TP2/asd/toLLVM_Visitor.java
View File

@@ -54,8 +54,7 @@ public class toLLVM_Visitor implements ProgramVisitor<SymTable,ProgramLLVMImp>,
fonctionLLVM.add(function);
}
}
System.out.println(h.print_all());
return new ProgramLLVMImp(new ArrayList<>(),fonctionLLVM);
return new ProgramLLVMImp(h.getDeclarationGlobal(),fonctionLLVM);
}
@@ -63,19 +62,17 @@ public class toLLVM_Visitor implements ProgramVisitor<SymTable,ProgramLLVMImp>,
@Override
public DefineLLVMImp visitFunction(FunctionImp fun, SymTable h) {
SymTable prevSymTable = h;
ArrayList<InstructionLLVM> instrLLVM = new ArrayList<>();
ArrayList<VarLLVMImp> paramsLLVM = new ArrayList<>();
for(VarImp param: fun.params()){
Result r = h.addParam(param.name());
String name = r.var;
VarLLVMImp var = new VarLLVMImp(new IntLLVMImp(), name);
VarLLVMImp var = new VarLLVMImp(new IntLLVMImp(), name,false);
h = r.symTable;
paramsLLVM.add(var);
}
instrLLVM.addAll(fun.instruction().accept(this, h));
DefineLLVMImp define = new DefineLLVMImp(fun.nom(), fun.type().accept(this, h), paramsLLVM, instrLLVM);
prevSymTable.updateId(h);
return define;
}
@@ -88,7 +85,6 @@ public class toLLVM_Visitor implements ProgramVisitor<SymTable,ProgramLLVMImp>,
@Override
public InstrAndSymTable visitDeclaration(DeclarationImp instr, SymTable h) {
SymTable prevSymTable = h;
ArrayList<InstructionLLVM> list = new ArrayList<>();
for(int i = 0; i<instr.s().size();i++){
TypeLLVM t2 = instr.t().accept(this,h);
@@ -96,9 +92,8 @@ public class toLLVM_Visitor implements ProgramVisitor<SymTable,ProgramLLVMImp>,
Result r = h.addVar(instr.s().get(i));
String name = r.var;
h = r.symTable;
list.add(new AssignLLVMImp(new VarLLVMImp(t2, name),new allocaLLVMImp(t2)));
list.add(new AssignLLVMImp(new VarLLVMImp(t2, name,false),new allocaLLVMImp(t2)));
}
prevSymTable.updateId(h);
return new InstrAndSymTable(list,h);
}
@@ -106,7 +101,6 @@ public class toLLVM_Visitor implements ProgramVisitor<SymTable,ProgramLLVMImp>,
@Override
public ArrayList<InstructionLLVM> visitBloc(BlocImp instr, SymTable h) {
SymTable prev = h;
h= h.newBlock();
ArrayList<InstructionLLVM> instrLLVM = new ArrayList<>();
for(int i = 0; i<instr.instrs().size(); i++){
@@ -114,13 +108,11 @@ public class toLLVM_Visitor implements ProgramVisitor<SymTable,ProgramLLVMImp>,
}
h= h.outBlock();
prev.updateId(h);
return instrLLVM;
}
@Override
public ArrayList<InstructionLLVM> visitBlocDec(BlocDecImp instr, SymTable h) {
SymTable prev = h;
ArrayList<InstructionLLVM> instrLLVM = new ArrayList<>();
for(int i = 0; i<instr.decls().size(); i++){
@@ -132,7 +124,6 @@ public class toLLVM_Visitor implements ProgramVisitor<SymTable,ProgramLLVMImp>,
instrLLVM.addAll(instr.instrs().get(i).accept(this, h));
}
prev.updateId(h);
return instrLLVM;
}
@@ -157,7 +148,7 @@ public class toLLVM_Visitor implements ProgramVisitor<SymTable,ProgramLLVMImp>,
ArrayList<InstructionLLVM> result = new ArrayList<>();
result.addAll(res.instrs);
//InstructionLLVM r = new AssignLLVMImp(new VarLLVMImpl(var.getType(),instr.t()),var);
InstructionLLVM r = new StoreLLVMImp(var.getType(),var,var.getType(),new VarLLVMImp(var.getType(),h.getVar(instr.t())));
InstructionLLVM r = new StoreLLVMImp(var.getType(),var,var.getType(),new VarLLVMImp(var.getType(),h.getVar(instr.t()),false));
result.add(r);
return result;
}
@@ -167,7 +158,15 @@ public class toLLVM_Visitor implements ProgramVisitor<SymTable,ProgramLLVMImp>,
public ArrayList<InstructionLLVM> visitPrint(PrintImp instr, SymTable h) {
ArrayList<InstructionLLVM> l = new ArrayList<>();
ArrayList<ValLLVM> params = new ArrayList<>();
l.add(new PrintLLVMImp(params)); //TODO
String name = h.getGlobalDeclName();
DeclarGlobalLLVMImp globalDecl = new DeclarGlobalLLVMImp(name);
VarLLVMImp varGlobal = new VarLLVMImp(new StringLLVMImp(),name,true);
h.addGlobalDecl(globalDecl);
params.add(varGlobal);
l.add(new PrintLLVMImp(globalDecl,params));
return l;
}
@@ -177,10 +176,18 @@ public class toLLVM_Visitor implements ProgramVisitor<SymTable,ProgramLLVMImp>,
for(int i = 0; i<instr.t().size(); i++){
String nomVar = h.getVar(instr.t().get(i).name());
Type typeVar = h.getType(instr.t().get(i).name());
VarLLVMImp newVar = new VarLLVMImp(typeVar.accept(this,h), nomVar);
VarLLVMImp newVar = new VarLLVMImp(typeVar.accept(this,h), nomVar,false);
ArrayList<ValLLVM> params = new ArrayList<>();
String name = h.getGlobalDeclName();
DeclarGlobalLLVMImp globalDecl = new DeclarGlobalLLVMImp(name);
VarLLVMImp varGlobal = new VarLLVMImp(new StringLLVMImp(),name,true);
h.addGlobalDecl(globalDecl);
params.add(varGlobal);
params.add(newVar);
l.add(new ReadLLVMImp(params));
l.add(new ReadLLVMImp(globalDecl,params));
}
return l;
}
@@ -212,7 +219,6 @@ public class toLLVM_Visitor implements ProgramVisitor<SymTable,ProgramLLVMImp>,
@Override
public ArrayList<InstructionLLVM> visitIfThen(IfThenImp instr, SymTable h) {
SymTable prevSymTable = h;
ArrayList<InstructionLLVM> l = new ArrayList<>();
String labelIf= "if"+h.getNewIdLabel()+":";
String labelThen= "then"+h.getNewIdLabel()+":";
@@ -225,7 +231,7 @@ public class toLLVM_Visitor implements ProgramVisitor<SymTable,ProgramLLVMImp>,
ExpressionLLVM exTemp = new IcmpLLVMImp(val,new ValLLVMImp(new IntLLVMImp(), 0));
Result r = h.addNewTempVar();
h = r.symTable;
VarLLVMImp varCond = new VarLLVMImp(exTemp.getType(), r.var);
VarLLVMImp varCond = new VarLLVMImp(exTemp.getType(), r.var,false);
l.add(new AssignLLVMImp(varCond,exTemp));
l.add(new BrCondLLVMImp(varCond,labelThen,labelFin));
@@ -236,13 +242,11 @@ public class toLLVM_Visitor implements ProgramVisitor<SymTable,ProgramLLVMImp>,
h=h.outBlock();
l.add(new LabelLLVMImp(labelFin));
prevSymTable.updateId(h);
return l;
}
@Override
public ArrayList<InstructionLLVM> visitIfThenElse(IfThenElseImp instr, SymTable h) {
SymTable prevSymTable = h;
ArrayList<InstructionLLVM> l = new ArrayList<>();
String labelIf= "if"+h.getNewIdLabel()+":";
String labelThen= "then"+h.getNewIdLabel()+":";
@@ -256,7 +260,7 @@ public class toLLVM_Visitor implements ProgramVisitor<SymTable,ProgramLLVMImp>,
ExpressionLLVM exTemp = new IcmpLLVMImp(val,new ValLLVMImp(new IntLLVMImp(), 0));
Result r = h.addNewTempVar();
h = r.symTable;
VarLLVMImp varCond = new VarLLVMImp(exTemp.getType(), r.var);
VarLLVMImp varCond = new VarLLVMImp(exTemp.getType(), r.var,false);
l.add(new AssignLLVMImp(varCond,exTemp));
l.add(new BrCondLLVMImp(varCond,labelThen,labelElse));
@@ -271,13 +275,11 @@ public class toLLVM_Visitor implements ProgramVisitor<SymTable,ProgramLLVMImp>,
l.add(new BrLLVMImp(labelFin));
l.add(new LabelLLVMImp(labelFin));
prevSymTable.updateId(h);
return l;
}
@Override
public ArrayList<InstructionLLVM> visitWhile(WhileImp instr, SymTable h) {
SymTable prevSymTable = h;
ArrayList<InstructionLLVM> l = new ArrayList<>();
String labelWhile = "while"+h.getNewIdLabel()+":";
@@ -291,7 +293,7 @@ public class toLLVM_Visitor implements ProgramVisitor<SymTable,ProgramLLVMImp>,
ExpressionLLVM exTemp = new IcmpLLVMImp(val,new ValLLVMImp(new IntLLVMImp(), 0));
Result r = h.addNewTempVar();
h = r.symTable;
VarLLVMImp varCond = new VarLLVMImp(exTemp.getType(), r.var);
VarLLVMImp varCond = new VarLLVMImp(exTemp.getType(), r.var,false);
l.add(new AssignLLVMImp(varCond,exTemp));
l.add(new BrCondLLVMImp(varCond,labelDo,labelDone));
@@ -304,7 +306,6 @@ public class toLLVM_Visitor implements ProgramVisitor<SymTable,ProgramLLVMImp>,
l.add(new BrLLVMImp(labelWhile));
l.add(new LabelLLVMImp(labelDone));
prevSymTable.updateId(h);
return l;
}
@@ -319,20 +320,17 @@ public class toLLVM_Visitor implements ProgramVisitor<SymTable,ProgramLLVMImp>,
@Override
public InstrAndVal visitVar(VarImp e, SymTable h) {
SymTable prevSymTable = h;
ArrayList<InstructionLLVM> l =new ArrayList<>();
ValLLVM val = new VarLLVMImp(h.getvar_Type(e.name()).accept(this,h),h.getVar(e.name()));
ValLLVM val = new VarLLVMImp(h.getvar_Type(e.name()).accept(this,h),h.getVar(e.name()),false);
Result r = h.addNewTempVar();
h = r.symTable;
VarLLVMImp varTemp = new VarLLVMImp(h.getvar_Type(e.name()).accept(this,h),r.var);
VarLLVMImp varTemp = new VarLLVMImp(h.getvar_Type(e.name()).accept(this,h),r.var,false);
l.add(new AssignLLVMImp(varTemp,((ExpressionLLVM)(new LoadLLVMImp(val)))));
prevSymTable.updateId(h);
return new InstrAndVal(l, varTemp);
}
@Override
public InstrAndVal visitBinOp(BinopExpressionImp e, SymTable h) {
SymTable prevSymTable = h;
ArrayList<InstructionLLVM> list = new ArrayList<>();
InstrAndVal res1 = e.e1().accept(this, h);
InstrAndVal res2 = e.e2().accept(this, h);
@@ -351,14 +349,12 @@ public class toLLVM_Visitor implements ProgramVisitor<SymTable,ProgramLLVMImp>,
Result r = h.addNewTempVar();
String temp = r.var;
h = r.symTable;
VarLLVMImp var = new VarLLVMImp(type,temp);
VarLLVMImp var = new VarLLVMImp(type,temp,false);
list.add(new AssignLLVMImp(var, new BinOpLLVMImp(type,e.op(),val1,val2)));
prevSymTable.updateId(h);
return new InstrAndVal(list, var);
}
public InstrAndVal visitAppeal(AppealImp instr,SymTable h){
SymTable prevSymTable = h;
ArrayList<InstructionLLVM> l = new ArrayList<>();
ArrayList<ValLLVM> paramsLLVM = new ArrayList<>();
for(Expression param : instr.params()){
@@ -375,10 +371,9 @@ public class toLLVM_Visitor implements ProgramVisitor<SymTable,ProgramLLVMImp>,
//Pour c=func(x,y)
Result res = h.addNewTempVar();
h = res.symTable;
VarLLVMImp var = new VarLLVMImp(fLLVM.define.type(), res.var);
VarLLVMImp var = new VarLLVMImp(fLLVM.define.type(), res.var,false);
l.add(new AssignLLVMImp(var, new CallLLVMImp(fLLVM.define,paramsLLVM,"")));
prevSymTable.updateId(h);
return new InstrAndVal(l, var);
}