Imperial-MEng/WACC_37
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: outofboundserror message includes given bad value

Browse Source
This commit is contained in:
Guy C
2025-02-28 00:15:20 +00:00
parent edcac2782b
commit cdf32d93c3
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/wacc/backend/RuntimeError.scala
View File

@@ -108,7 +108,7 @@ object RuntimeError {
def generateHandler: Chain[AsmLine] = Chain( def generateHandler: Chain[AsmLine] = Chain(
LabelDef(OutOfBoundsError.errLabel), LabelDef(OutOfBoundsError.errLabel),
Pop(RSI), Move(RSI, Register(Q64, CX)),
stackAlign, stackAlign,
Load(RDI, IndexAddress(RIP, LabelArg(OutOfBoundsError.strLabel))), Load(RDI, IndexAddress(RIP, LabelArg(OutOfBoundsError.strLabel))),
assemblyIR.Call(CLibFunc.PrintF), assemblyIR.Call(CLibFunc.PrintF),

4
src/main/wacc/backend/asmGenerator.scala
View File

@@ -191,8 +191,10 @@ object asmGenerator {
case ArrayElem(x, i) => case ArrayElem(x, i) =>
chain ++= evalExprOntoStack(rhs) chain ++= evalExprOntoStack(rhs)
chain ++= evalExprOntoStack(i) chain ++= evalExprOntoStack(i)
chain += Compare(stack.head, ImmediateVal(0)) chain += stack.pop(RCX)
chain += Compare(ECX, ImmediateVal(0))
chain += Jump(LabelArg(OutOfBoundsError.errLabel), Cond.Less) chain += Jump(LabelArg(OutOfBoundsError.errLabel), Cond.Less)
chain += stack.push(Q64, RCX)
chain ++= evalExprOntoStack(x) chain ++= evalExprOntoStack(x)
chain += stack.pop(RAX) chain += stack.pop(RAX)
chain += stack.pop(RCX) chain += stack.pop(RCX)