new run state

Author: ChippyPlus

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

@@ -37,7 +37,7 @@ class Execute(val kp: KProcess) {
 		parser(kp, kp.file.readLines())
 	}
 
-	fun singleEvent(command: InstructData) {
+	suspend fun singleEvent(command: InstructData) {
 		kp.vm.pc++
 		if (kp.vm.pc - 1 < 0) {
 			kp.vm.errors.InvalidPcValueException((kp.vm.pc - 1).toString())
@@ -50,10 +50,10 @@ class Execute(val kp: KProcess) {
 	}
 
 
-	fun run(command: List<InstructData>) {
+	suspend fun run(command: List<InstructData>) {
 		val vm = kp.vm
 		while (true) {
-			when (vm.runtimeState) {
+			when (kp.runtimeState) {
 
 				RuntimeStates.RUNNING -> {/* pass */
 
@@ -87,7 +87,7 @@ class Execute(val kp: KProcess) {
 //	}
 
 
-	fun exeWhen(name: String, args: Array<Any?>): Unit? { // This has to be suspended I know its terrible!
+	suspend fun exeWhen(name: String, args: Array<Any?>): Unit? { // This has to be suspended I know its terrible!
 		val vm = kp.vm
 		kp.currentInstruction = InstructData(name, args)
 

src/main/kotlin/internals/Vm.kt

@@ -7,7 +7,6 @@ import data.registers.read
 import data.vfs.Vfs
 import environment.VMErrors
 import helpers.Helpers
-import helpers.RuntimeStates
 import internals.instructions.arithmetic.Arithmetic
 import internals.instructions.bitwise.Bitwise
 import internals.instructions.controlFlow.ControlFlow
@@ -52,9 +51,6 @@ class Vm {
 	var heap: Heap? = null
 
 
-	var runtimeState = RuntimeStates.RUNNING
-
-
 }
 
 

src/main/kotlin/kernel/KProcess.kt

@@ -3,14 +3,15 @@ package kernel
 import data.memory.ProcessMemory
 import engine.execution.InstructData
 import environment.reflection.reflection
+import helpers.RuntimeStates
 import internals.Vm
 import internals.debug.Debug
 import os
 import java.io.File
 
 data class KProcess(val vm: Vm, var file: File) {
 	val debug = Debug(this)
-
+	var runtimeState = RuntimeStates.RUNNING
 	val addressSpace = ProcessMemory(this)
 	var currentInstruction: InstructData = InstructData(name = "init", arrayOf())
 

src/main/kotlin/kernel/systemCalls/SystemCall.kt

@@ -24,7 +24,7 @@ class SystemCall(val vm: Vm) {
 	val errors = vm.errors
 	val registers = vm.registers
 
-	fun execute(
+	suspend fun execute(
 		callId: RegisterType,
 		s2: RegisterType,
 		s3: RegisterType,

src/main/kotlin/kernel/systemCalls/calls/spawn.kt

@@ -20,10 +20,10 @@ fun SystemCall.share_m(vm_id: RegisterType, fromX: RegisterType, toX: RegisterTy
 
 fun SystemCall.pause_t(vmToPause: RegisterType) {
 	val x = reflection.vmTracker.groupBy(KProcess::id)
-	x[registers.read(vmToPause).toInt()]!![0].vm.runtimeState = RuntimeStates.PAUSED
+	x[registers.read(vmToPause).toInt()]!![0].runtimeState = RuntimeStates.PAUSED
 }
 
 fun SystemCall.continue_t(vmToPause: RegisterType) {
 	val x = reflection.vmTracker.groupBy(KProcess::id)
-	x[registers.read(vmToPause).toInt()]!![0].vm.runtimeState = RuntimeStates.RUNNING
+	x[registers.read(vmToPause).toInt()]!![0].runtimeState = RuntimeStates.RUNNING
 }