working str

Author: ChippyPlus

src/main/kotlin/Main.kt

@@ -1,4 +1,3 @@
-
 import data.io.FileDescriptors
 import data.memory.InternalMemory
 import data.registers.Registers
@@ -99,6 +98,11 @@ fun main(args: Array<String>) {
 			exitProcess(1)
 		}
 	}
+
+	exitVM()
 }
 
 
+fun exitVM(): Nothing = exitProcess(0)
+
+

src/main/kotlin/data/registers/RegisterType.kt

@@ -8,7 +8,7 @@ import data.registers.RegisterDataType.*
  * This enumeration allows for a unified way to refer to any register type, regardless of its specific category (General, System, or Return).
  */
 enum class RegisterType {
-	G1, G2, G3, G4, G5, G6, G7, G8, F1, F2, F3, F4, F5, F6, F7, F8, IF1, IF2, IF3, IF4, IF5, IF6, IF7, IF8, R1, R2, R3, R4, R5, R6, R7, R8, S4, S1, S2, S3, I1, I2, I3, I4, I5, I6, I7,I8, X0, X1, X2, X3, X4, X5, X6, X7, X8,
+	G1, G2, G3, G4, G5, G6, G7, G8, F1, F2, F3, F4, F5, F6, F7, F8, R1, R2, R3, R4, R5, R6, R7, R8, S4, S1, S2, S3, I1, I2, I3, I4, I5, I6, I7, I8, X0, X1, X2, X3, X4, X5, X6, X7, X8,
 }
 
 fun String.toRegisterDataType() = when (this.lowercase()) {
@@ -58,9 +58,6 @@ data class RegisterData(val name: RegisterType, var data: Long?, var dataType: R
 	}
 
 
-
-
-
 	fun settype(newType: RegisterDataType) {
 		dataType = when (newType) {
 			RByte -> RByte

src/main/kotlin/engine/v2/TransMapIDs.kt

@@ -31,11 +31,8 @@ class TransMapIDs {
 		F2 to '™',
 		F3 to '£',
 		F4 to '¢',
-		IF1 to '∞',
-		IF2 to '§',
-		IF3 to '¶',
-		IF4 to '•'
-	)
+
+		)
 
 	val instructions = mapOf(
 		"mov" to 'a',

src/main/kotlin/environment/ExecuteLib.kt

@@ -6,9 +6,8 @@ import environment.libEx.executeMar
 import environment.libEx.findMarLib
 import java.io.File
 
-
+val snapShotManager = SnapShotManager()
 class ExecuteLib {
-	val sm = SnapShotManager()
 	var currentFunction = ""
 	var enabledFunction = false
 

src/main/kotlin/environment/libEx/SnapShotManager.kt

@@ -7,6 +7,9 @@ import internalMemory
 import registers
 
 class SnapShotManager {
+
+	var safeMemory = mutableSetOf<LongRange>()
+
 	fun populateSnapShotRegister(snapShotRegisters: Map<RegisterType, Long?>) {
 		for (i in snapShotRegisters) {
 			registers.writeUnsafe(i.key, i.value)
@@ -15,16 +18,22 @@ class SnapShotManager {
 
 	fun snapShotRegisters(): Map<RegisterType, Long?> {
 		val allRegisters = mutableMapOf<RegisterType, Long?>()
+		allRegisters.forEach { if (!it.key.name.startsWith('I')) allRegisters.remove(it.key) }
 		for (i in RegisterType.entries) {
 			allRegisters[i] = registers.readUnsafe(i)
 		}
 		return allRegisters
 	}
 
-	fun snapShotMemory(): Map<MemoryAddress, MemoryValue> = internalMemory.memory
-
+	fun snapShotMemory(): Map<MemoryAddress, MemoryValue> = internalMemory.memory.toMutableMap()
 	fun populateSnapShotMemory(memory: Map<MemoryAddress, MemoryValue>) {
-		internalMemory.memory = memory.toMutableMap()
+		val internalMem = memory.toMutableMap()
+		safeMemory.forEach {
+			for (i in it) {
+				internalMem[MemoryAddress(i)] = internalMemory.memory[MemoryAddress(i)] as MemoryValue
+			}
+		}
+		internalMemory.memory = internalMem.toMutableMap()
 	}
 
 
@@ -37,6 +46,12 @@ class SnapShotManager {
 	fun populateSnapShot(data: SnapData) {
 		populateSnapShotMemory(data.memory)
 		populateSnapShotRegister(data.registers)
+		safeMemory.clear()
+	}
+
+
+	fun memoryRequestBlock(intRange: LongRange) {
+		safeMemory.add(intRange)
 	}
 
 

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

@@ -1,17 +1,18 @@
 package environment.libEx
 
 import environment.ExecuteLib
+import environment.snapShotManager
 import errors
 import kilb.Klib
 import vm
 
 fun ExecuteLib.executeKt(name: String) {
 	val oldPc = vm.pc
-	val snapshot = sm.fullSnapshot()
+	val snapshot = snapShotManager.fullSnapshot()
 	if (!Klib().match(name)) {
 		errors.MissingLibraryException(name) // Kt should be the last resort
 	}
 	currentFunction = name
-	sm.populateSnapShot(snapshot)
+	snapShotManager.populateSnapShot(snapshot)
 	vm.pc = oldPc
 }

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

@@ -3,14 +3,15 @@ package environment.libEx
 import engine.execution.Execute
 import engine.parser
 import environment.ExecuteLib
+import environment.snapShotManager
 import vm
 import java.io.File
 
 fun ExecuteLib.executeMar(file: File) {
 	val oldPc = vm.pc
-	val snapshot = sm.fullSnapshot()
+	val snapshot = snapShotManager.fullSnapshot()
 	vm.pc - 2
 	Execute().run(parser(file.readLines().subList(0, file.readLines().size)))
-	sm.populateSnapShot(snapshot)
+	snapShotManager.populateSnapShot(snapshot)
 	vm.pc = oldPc
 }

src/main/kotlin/helpers/stringToSuperRegisterType.kt

@@ -47,14 +47,6 @@ fun String.toUnsafeRegisterType(): RegisterType? {
 		"f7" -> RegisterType.F7
 		"f8" -> RegisterType.F8
 
-		"if1" -> RegisterType.IF1
-		"if2" -> RegisterType.IF2
-		"if3" -> RegisterType.IF3
-		"if4" -> RegisterType.IF4
-		"if5" -> RegisterType.IF5
-		"if6" -> RegisterType.IF6
-		"if7" -> RegisterType.IF7
-		"if8" -> RegisterType.IF8
 
 		"i1" -> RegisterType.I1
 		"i2" -> RegisterType.I2

src/main/kotlin/kilb/Strings.kt

@@ -4,6 +4,7 @@ import data.memory.MemoryAddress
 import data.registers.IntelRegisters
 import data.registers.RegisterType
 import data.registers.intelNames
+import environment.snapShotManager
 import helpers.readRegisterString
 import helpers.toLong
 import helpers.writeClosestString
@@ -21,8 +22,9 @@ class Strings {
 //		if (s1 == s2) registers.write(register = R4, value = 0)
 //		else registers.write(register = R4, value = 1)
 
-		if (s1 == s2) vm.stackOperations.internalStack.push(true.toLong())
-		else vm.stackOperations.internalStack.push(false.toLong())
+
+		if (s1 == s2) registers.write(intelNames[IntelRegisters.EF], true.toLong())
+		else registers.write(intelNames[IntelRegisters.EF], false.toLong())
 
 	}
 
@@ -31,6 +33,7 @@ class Strings {
 		val s1: String = readRegisterString(register = RegisterType.F1)
 		val s2: Comparable<String> = readRegisterString(register = RegisterType.F2)
 		val location = writeClosestString(string = (s1 + s2))
+		snapShotManager.memoryRequestBlock(location..location + (s1 + s2).length)
 //		registers.write(R4, location)
 		vm.stackOperations.internalStack.push(location)
 
@@ -40,6 +43,7 @@ class Strings {
 		registers.write(intelNames[IntelRegisters.ENSF], true.toLong())
 		val string: String = readRegisterString(register = RegisterType.F1)
 		val destinationAddress: Long = registers.read(register = RegisterType.F2)
+		snapShotManager.memoryRequestBlock(destinationAddress..destinationAddress + string.length)
 		writeStringSpecInMemory(string = string, destinationAddress = MemoryAddress(address = destinationAddress))
 	}