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

8086: partially fix memory leak in unit tests

Browse Source
This commit is contained in:
Karol Stasiak 2019-06-12 02:56:44 +02:00
parent 91a7e42d9f
commit 3b3fb24284
2 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@ -41,5 +41,5 @@ examples/lunix/
HELLO HELLO
HELLOCPC HELLOCPC
#heap dumps
java_pid*

23
src/test/scala/millfork/test/emu/EmuI86Run.scala
View File

@ -5,7 +5,7 @@ import java.nio.file.{Files, Paths}
import com.codingrodent.microprocessor.Z80.Z80Core import com.codingrodent.microprocessor.Z80.Z80Core
import fastparse.core.Parsed.{Failure, Success} import fastparse.core.Parsed.{Failure, Success}
import fr.neatmonster.ibmpc.{IBMCGA, Intel8086} import fr.neatmonster.ibmpc.{IBMCGA, Intel8086, Intel8255, Intel8259, Motorola6845}
import javax.swing.SwingUtilities import javax.swing.SwingUtilities
import millfork._ import millfork._
import millfork.assembly.AssemblyOptimization import millfork.assembly.AssemblyOptimization
@ -55,6 +55,11 @@ object EmuI86Run {
def cachedMath(): Program = get("include/i80_math.mfk") // TODO def cachedMath(): Program = get("include/i80_math.mfk") // TODO
def cachedStdio(): Program = get("src/test/resources/include/dummy_stdio.mfk") def cachedStdio(): Program = get("src/test/resources/include/dummy_stdio.mfk")
val leakSaverCpu = new Intel8086()
val leakSaverCrtc = new Motorola6845()
val leakSaverPic = new Intel8259()
val leakSaverPpi = new Intel8255(leakSaverPic)
} }
class EmuI86Run(nodeOptimizations: List[NodeOptimization], assemblyOptimizations: List[AssemblyOptimization[ZLine]]) extends Matchers { class EmuI86Run(nodeOptimizations: List[NodeOptimization], assemblyOptimizations: List[AssemblyOptimization[ZLine]]) extends Matchers {
@ -183,6 +188,10 @@ class EmuI86Run(nodeOptimizations: List[NodeOptimization], assemblyOptimizations
clocks = sniffField[Long](cpu, "clocks") clocks = sniffField[Long](cpu, "clocks")
} while(clocks < 100000 && sniffMethod[Boolean](cpu, "tick")) } while(clocks < 100000 && sniffMethod[Boolean](cpu, "tick"))
SwingUtilities.getWindowAncestor(sniffField[IBMCGA](cpu, "cga")).setVisible(false) SwingUtilities.getWindowAncestor(sniffField[IBMCGA](cpu, "cga")).setVisible(false)
// CGA's leak, so at least don't let other objects leak
setField(sniffField[IBMCGA](cpu, "cga"), "cpu", EmuI86Run.leakSaverCpu)
setField(sniffField[IBMCGA](cpu, "cga"), "ppi", EmuI86Run.leakSaverPpi)
setField(sniffField[IBMCGA](cpu, "cga"), "crtc", EmuI86Run.leakSaverCrtc)
if (clocks >= 100000) throw new RuntimeException("Timeout") if (clocks >= 100000) throw new RuntimeException("Timeout")
0x100.until(1<<16).foreach(i => memoryBank.output(i) = memory(i).toByte) 0x100.until(1<<16).foreach(i => memoryBank.output(i) = memory(i).toByte)
Timings(-1, -1) -> memoryBank Timings(-1, -1) -> memoryBank
@ -198,10 +207,16 @@ class EmuI86Run(nodeOptimizations: List[NodeOptimization], assemblyOptimizations
} }
} }
def sniffField[T](intel8086: Intel8086, fieldName: String): T = { def sniffField[T](obj: AnyRef, fieldName: String): T = {
val f = intel8086.getClass.getDeclaredField(fieldName) val f = obj.getClass.getDeclaredField(fieldName)
f.setAccessible(true) f.setAccessible(true)
f.get(intel8086).asInstanceOf[T] f.get(obj).asInstanceOf[T]
}
def setField(obj: AnyRef, fieldName: String, value: Any): Unit = {
val f = obj.getClass.getDeclaredField(fieldName)
f.setAccessible(true)
f.set(obj, value)
} }
def sniffMethod[T](intel8086: Intel8086, fieldName: String): T = { def sniffMethod[T](intel8086: Intel8086, fieldName: String): T = {