restructuring vm

compiler/src/prog8/CompilerMain.kt

@@ -7,17 +7,18 @@ import prog8.ast.base.checkRecursion
 import prog8.ast.base.checkValid
 import prog8.ast.base.reorderStatements
 import prog8.ast.statements.Directive
-import prog8.astvm.AstVm
+import prog8.vm.astvm.AstVm
 import prog8.compiler.*
 import prog8.compiler.target.c64.AsmGen
 import prog8.compiler.target.c64.C64Zeropage
-import prog8.optimizing.constantFold
-import prog8.optimizing.optimizeStatements
-import prog8.optimizing.simplifyExpressions
+import prog8.optimizer.constantFold
+import prog8.optimizer.optimizeStatements
+import prog8.optimizer.simplifyExpressions
 import prog8.parser.ParsingFailedError
 import prog8.parser.importLibraryModule
 import prog8.parser.importModule
 import prog8.parser.moduleName
+import prog8.vm.stackvm.stackVmMain
 import java.io.File
 import java.io.PrintStream
 import java.lang.Exception

compiler/src/prog8/compiler/Compiler.kt

@@ -11,7 +11,7 @@ import prog8.compiler.intermediate.Opcode
 import prog8.compiler.intermediate.branchOpcodes
 import prog8.functions.BuiltinFunctions
 import prog8.parser.tryGetEmbeddedResource
-import prog8.stackvm.Syscall
+import prog8.vm.stackvm.Syscall
 import java.io.File
 import java.nio.file.Path
 import java.util.*

compiler/src/prog8/compiler/intermediate/Instruction.kt

@@ -1,7 +1,7 @@
 package prog8.compiler.intermediate
 
 import prog8.compiler.RuntimeValue
-import prog8.stackvm.Syscall
+import prog8.vm.stackvm.Syscall
 
 open class Instruction(val opcode: Opcode,
                        val arg: RuntimeValue? = null,

compiler/src/prog8/compiler/target/c64/AsmGen.kt

@@ -10,8 +10,8 @@ import prog8.ast.base.printWarning
 import prog8.compiler.RuntimeValue
 import prog8.compiler.*
 import prog8.compiler.intermediate.*
-import prog8.stackvm.Syscall
-import prog8.stackvm.syscallsForStackVm
+import prog8.vm.stackvm.Syscall
+import prog8.vm.stackvm.syscallsForStackVm
 import java.io.File
 import java.util.*
 import kotlin.math.abs

compiler/src/prog8/optimizer/CallGraph.kt

@@ -1,4 +1,4 @@
-package prog8.optimizing
+package prog8.optimizer
 
 import prog8.ast.*
 import prog8.ast.base.ParentSentinel

compiler/src/prog8/optimizer/ConstExprEvaluator.kt

@@ -1,4 +1,4 @@
-package prog8.optimizing
+package prog8.optimizer
 
 import prog8.ast.*
 import prog8.ast.base.DataType

compiler/src/prog8/optimizer/ConstantFolding.kt

@@ -1,4 +1,4 @@
-package prog8.optimizing
+package prog8.optimizer
 
 import prog8.ast.*
 import prog8.ast.base.*

compiler/src/prog8/optimizer/Extensions.kt

@@ -1,4 +1,4 @@
-package prog8.optimizing
+package prog8.optimizer
 
 import prog8.ast.*
 import prog8.ast.base.AstException

compiler/src/prog8/optimizer/SimplifyExpressions.kt

@@ -1,4 +1,4 @@
-package prog8.optimizing
+package prog8.optimizer
 
 import prog8.ast.*
 import prog8.ast.base.AstException

compiler/src/prog8/optimizer/StatementOptimizer.kt

@@ -1,4 +1,4 @@
-package prog8.optimizing
+package prog8.optimizer
 
 import prog8.ast.*
 import prog8.ast.base.*

compiler/src/prog8/vm/astvm/AstVm.kt

@@ -1,4 +1,4 @@
-package prog8.astvm
+package prog8.vm.astvm
 
 import prog8.ast.*
 import prog8.ast.base.*

compiler/src/prog8/vm/astvm/BuiltinFunctions.kt

@@ -1,4 +1,4 @@
-package prog8.astvm
+package prog8.vm.astvm
 
 import prog8.ast.base.DataType
 import prog8.compiler.RuntimeValue

compiler/src/prog8/vm/astvm/CallStack.kt

@@ -1,4 +1,4 @@
-package prog8.astvm
+package prog8.vm.astvm
 
 import prog8.ast.INameScope
 import java.util.*

compiler/src/prog8/vm/astvm/Expressions.kt

@@ -1,4 +1,4 @@
-package prog8.astvm
+package prog8.vm.astvm
 
 import prog8.ast.*
 import prog8.ast.base.ArrayElementTypes

compiler/src/prog8/vm/astvm/Memory.kt

@@ -1,4 +1,4 @@
-package prog8.astvm
+package prog8.vm.astvm
 
 import prog8.compiler.target.c64.Mflpt5
 import prog8.compiler.target.c64.Petscii

compiler/src/prog8/vm/astvm/ScreenDialog.kt

@@ -1,4 +1,4 @@
-package prog8.astvm
+package prog8.vm.astvm
 
 import prog8.compiler.target.c64.Charset
 import prog8.compiler.target.c64.Colors
@@ -79,7 +79,7 @@ class BitmapScreenPanel : KeyListener, JPanel() {
         for(sc in Petscii.encodeScreencode(text, lowercase)) {
             setChar(cursorX, cursorY, sc, color)
             cursorX++
-            if(cursorX>=(SCREENWIDTH/8)) {
+            if(cursorX>=(SCREENWIDTH /8)) {
                 cursorY++
                 cursorX=0
             }
@@ -149,11 +149,11 @@ class ScreenDialog(title: String) : JFrame(title) {
 
         // the borders (top, left, right, bottom)
         val borderTop = JPanel().apply {
-            preferredSize = Dimension(BitmapScreenPanel.SCALING * (BitmapScreenPanel.SCREENWIDTH+2*borderWidth), BitmapScreenPanel.SCALING * borderWidth)
+            preferredSize = Dimension(BitmapScreenPanel.SCALING * (BitmapScreenPanel.SCREENWIDTH +2*borderWidth), BitmapScreenPanel.SCALING * borderWidth)
             background = Colors.palette[14]
         }
         val borderBottom = JPanel().apply {
-            preferredSize =Dimension(BitmapScreenPanel.SCALING * (BitmapScreenPanel.SCREENWIDTH+2*borderWidth), BitmapScreenPanel.SCALING * borderWidth)
+            preferredSize =Dimension(BitmapScreenPanel.SCALING * (BitmapScreenPanel.SCREENWIDTH +2*borderWidth), BitmapScreenPanel.SCALING * borderWidth)
             background = Colors.palette[14]
         }
         val borderLeft = JPanel().apply {

compiler/src/prog8/vm/astvm/VariablesCreator.kt

@@ -1,4 +1,4 @@
-package prog8.astvm
+package prog8.vm.astvm
 
 import prog8.ast.*
 import prog8.ast.base.*

compiler/src/prog8/vm/stackvm/Main.kt

@@ -1,7 +1,7 @@
-package prog8
+package prog8.vm.stackvm
 
-import prog8.astvm.ScreenDialog
-import prog8.stackvm.*
+import prog8.printSoftwareHeader
+import prog8.vm.astvm.ScreenDialog
 import java.awt.EventQueue
 import javax.swing.Timer
 import kotlin.system.exitProcess

compiler/src/prog8/vm/stackvm/Program.kt

@@ -1,4 +1,4 @@
-package prog8.stackvm
+package prog8.vm.stackvm
 
 import prog8.ast.antlr.unescape
 import prog8.ast.base.*

compiler/src/prog8/vm/stackvm/StackVm.kt

@@ -1,12 +1,12 @@
-package prog8.stackvm
+package prog8.vm.stackvm
 
 import prog8.ast.base.DataType
 import prog8.ast.base.IterableDatatypes
 import prog8.ast.base.NumericDatatypes
 import prog8.ast.base.Register
 import prog8.ast.base.initvarsSubName
-import prog8.astvm.BitmapScreenPanel
-import prog8.astvm.Memory
+import prog8.vm.astvm.BitmapScreenPanel
+import prog8.vm.astvm.Memory
 import prog8.compiler.RuntimeValue
 import prog8.compiler.HeapValues
 import prog8.compiler.IntegerOrAddressOf

compiler/test/StackVMOpcodeTests.kt

@@ -12,7 +12,7 @@ import prog8.compiler.RuntimeValue
 import prog8.compiler.HeapValues
 import prog8.compiler.intermediate.Instruction
 import prog8.compiler.intermediate.Opcode
-import prog8.stackvm.*
+import prog8.vm.stackvm.*
 import kotlin.test.*
 
 
@@ -60,7 +60,8 @@ class TestStackVmOpcodes {
                          labels: Map<String, Int>?=null,
                          mem: Map<Int, List<RuntimeValue>>?=null) : Program {
         val heap = HeapValues()
-        return Program("test", ins, vars ?: mapOf(), memoryPointers ?: mapOf(), labels ?: mapOf(), mem ?: mapOf(), heap)
+        return Program("test", ins, vars ?: mapOf(), memoryPointers ?: mapOf(), labels ?: mapOf(), mem
+                ?: mapOf(), heap)
     }
 
     @Test