Very broken snapshots

Author: ChippyPlus

main.kar

@@ -1,6 +1,3 @@
-str s2 "I love men? !>"
-lit s1 24
-str f1 "kys"
-printr s1
-call io.println
-printr s1
+
+lit f1 15
+call alloc f1

src/main/kotlin/Main.kt

@@ -25,6 +25,8 @@ fun main(args: Array<String>): Unit = runBlocking(newSingleThreadContext("Kotlin
 		println("Usage: mvm <command> [options]")
 		exitProcess(1)
 	}
+
+
 	when (args[0]) {
 		"irun" -> {
 			if (args.size < 2) {
@@ -50,8 +52,9 @@ fun main(args: Array<String>): Unit = runBlocking(newSingleThreadContext("Kotlin
 				println("Usage: mvm tokenise <file.kar>")
 				exitProcess(1)
 			}
-			println("Deprecated!")
-//			VarRedundancy(globalInfo = parser(init, File(args[1]).readLines())).cleanRedundancy().forEach(::println)
+			println(
+				"Deprecated!"
+			) //			VarRedundancy(globalInfo = parser(init, File(args[1]).readLines())).cleanRedundancy().forEach(::println)
 		}
 
 

src/main/kotlin/engine/execution/Execute.kt

@@ -49,6 +49,7 @@ import internals.instructions.xFloats.xMul
 import internals.instructions.xFloats.xPow
 import internals.instructions.xFloats.xSub
 import kernel.process.KProcess
+import os
 
 
 class Execute(val kp: KProcess) {
@@ -62,9 +63,11 @@ class Execute(val kp: KProcess) {
 			kp.vm.errors.invalidPcValueException((kp.vm.pc).toString())
 		}
 
+		os.snapShotManager.populateSnapShotRegister(kp) // Broken???
 
 		exeWhen(command.name, command.values)
 
+		os.snapShotManager.snapShotRegisters(kp) // Also broken????
 		kp.vm.pc++
 
 	}
@@ -112,8 +115,7 @@ class Execute(val kp: KProcess) {
 	suspend fun exeWhen(name: String, args: Array<Any?>): Unit? { // This has to be suspended. I know it's terrible!
 		val vm = kp.vm
 		kp.currentInstruction = InstructData(name, args)
-
-		kp.debug.act()
+//		kp.debug.act()
 
 
 		when (name) {

src/main/kotlin/kernel/SnapShotManager.kt

@@ -4,7 +4,7 @@ import data.registers.RegisterType
 import data.registers.Registers
 import internals.Vm
 import kernel.process.KProcess
-
+//@Depre
 class SnapShotManager(private val registers: Registers) {
 
 	private val snapshots = mutableMapOf<KProcess, Map<RegisterType, Long>>()
@@ -16,9 +16,9 @@ class SnapShotManager(private val registers: Registers) {
 
 	}
 
-	fun snapShotRegisters(kProcess: KProcess) {
+	fun snapShotRegisters(kProcess: KProcess) { //TODO NOT WORKING!!!
 		val allRegisters = mutableMapOf<RegisterType, Long>()
-		for (i in RegisterType.entries) {
+		for (i in RegisterType.entries) { // NOT WORKING!
 			allRegisters[i] = registers.read(i)
 		}
 		snapshots[kProcess] = allRegisters //		println("${kProcess.file.name}:${kProcess.vm.pc} -> [SNAPSHOT]")

src/main/kotlin/kernel/libEx/executeKt.kt

@@ -11,9 +11,11 @@ suspend fun ExecuteLib.executeKt(name: String) {
 	val newVm = Vm()
 	val registerReserves =
 		vm.registers.registers.map { (k, v) -> k to v.copy() }.toMap()
+
 	val newKp = KProcess(newVm, File("\$lib-$name"), isKlib = true)
-	os.snapShotManager.snapShotRegisters(newKp)
+//	os.snapShotManager.snapShotRegisters(newKp)
 	for (registerType in registerReserves) vm.registers.registers[registerType.key] = registerType.value
 	if (!Klib(newKp).match(name)) vm.errors.missingLibraryException(name) // Kt should be the last resort
 	currentFunction = name
+
 }

src/main/kotlin/kernel/libEx/executeMar.kt

@@ -11,15 +11,16 @@ import java.io.File
 @OptIn(UnstableSnapShots::class)
 suspend fun ExecuteLib.executeMar(file: File) {
 
-	val localKp = KProcess(Vm(), file)
-	os.snapShotManager.snapShotRegisters(kp)
+	val localKp = KProcess(Vm(), file) //	os.snapShotManager.snapShotRegisters(kp)
+	val registerReserves = vm.registers.registers.map { (k, v) -> k to v.copy() }.toMap()
 
 	val oldInstructs = kp.instructionMemory
 
 	localKp.instructionMemory = parserReturn(localKp.vm, file.readLines())
 	localKp.notifyOS()
+	for (registerType in registerReserves) vm.registers.registers[registerType.key] = registerType.value
 
 	kp.instructionMemory = oldInstructs
 
-	os.snapShotManager.populateSnapShotRegister(kp)
+//	os.snapShotManager.populateSnapShotRegister(kp)
 }

src/main/kotlin/kilb/Ll.kt

@@ -0,0 +1,28 @@
+package kilb
+
+import kernel.process.KProcess
+
+class Ll(kp: KProcess) {
+	val h = kp.addressSpace.heap
+	fun create(): Long {
+		val initP = h.alloc(2)
+		return initP
+	}
+
+	fun add(ll: Long, element: Long) {
+//		val addr = h.get()
+	}
+
+	fun getAt(index: Long) {
+
+	}
+
+	fun removeAt(index: Long) {}
+
+	fun clean() {}
+
+	fun findL() {}
+
+	fun findR() {}
+
+}