6502/millfork
1
0
Fork 0
mirror of https://github.com/KarolS/millfork.git synced 2025-01-11 12:29:46 +00:00
Code Issues Projects Releases Wiki Activity

Fix badly handled stack overflow

Browse Source
This commit is contained in:
Karol Stasiak 2018-10-12 00:00:41 +02:00
parent df71435c78
commit 30c979cc39
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/scala/millfork/error/ConsoleLogger.scala
View File

@ -33,6 +33,7 @@ class ConsoleLogger extends Logger {
} }
} }
@inline
def f(position: Option[Position]): String = position.fold("")(p => s"(${p.moduleName}:${p.line}:${p.column}) ") def f(position: Option[Position]): String = position.fold("")(p => s"(${p.moduleName}:${p.line}:${p.column}) ")
override def info(msg: String, position: Option[Position] = None): Unit = { override def info(msg: String, position: Option[Position] = None): Unit = {

7
src/main/scala/millfork/output/AbstractAssembler.scala
View File

@ -79,7 +79,13 @@ abstract class AbstractAssembler[T <: AbstractCode](private val program: Program
} }
} }
var stackProbeCount = 0
def deepConstResolve(c: Constant): Long = { def deepConstResolve(c: Constant): Long = {
def stackProbe(n: Int): Int = {
stackProbeCount += 1
if (n == 0) 0 else stackProbe(n - 1) + 1
}
c match { c match {
case NumericConstant(v, _) => v case NumericConstant(v, _) => v
case AssertByte(inner) => case AssertByte(inner) =>
@ -100,6 +106,7 @@ abstract class AbstractAssembler[T <: AbstractCode](private val program: Program
val x5 = env.maybeGet[RelativeVariable](th.name).map(_.address) val x5 = env.maybeGet[RelativeVariable](th.name).map(_.address)
val x6 = env.maybeGet[ConstantThing](th.name.stripSuffix(".array") + ".addr").map(_.value) val x6 = env.maybeGet[ConstantThing](th.name.stripSuffix(".array") + ".addr").map(_.value)
val x = x1.orElse(x2).orElse(x3).orElse(x4).orElse(x5).orElse(x6) val x = x1.orElse(x2).orElse(x3).orElse(x4).orElse(x5).orElse(x6)
stackProbe(700)
x match { x match {
case Some(cc) => case Some(cc) =>
deepConstResolve(cc) deepConstResolve(cc)