From b5d1e8653db3c5274fcc4271f5510b342e78dd98 Mon Sep 17 00:00:00 2001
From: Irmen de Jong <irmen@razorvine.net>
Date: Sun, 13 Oct 2019 07:35:51 +0200
Subject: [PATCH] tiny cleanups

---
 .idea/inspectionProfiles/Project_Default.xml  | 10 ++++
 compiler/res/prog8lib/prog8lib.asm            | 56 +++++++++----------
 compiler/src/prog8/ast/AstToplevel.kt         |  2 +-
 compiler/src/prog8/compiler/Main.kt           |  2 +-
 .../compiler/target/c64/AssemblyProgram.kt    |  2 +-
 .../compiler/target/c64/codegen/AsmGen.kt     |  8 +--
 .../prog8/optimizer/SimplifyExpressions.kt    |  2 +-
 .../src/prog8/optimizer/StatementOptimizer.kt |  4 +-
 compiler/src/prog8/parser/ModuleParsing.kt    |  2 +-
 compiler/src/prog8/vm/astvm/AstVm.kt          | 12 ++--
 compiler/src/prog8/vm/astvm/Memory.kt         |  4 +-
 11 files changed, 57 insertions(+), 47 deletions(-)

diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
index 9c754da3c..add8a2197 100644
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -1,6 +1,16 @@
 <component name="InspectionProjectProfileManager">
   <profile version="1.0">
     <option name="myName" value="Project Default" />
+    <inspection_tool class="DuplicatedCode" enabled="true" level="WEAK WARNING" enabled_by_default="true">
+      <Languages>
+        <language minSize="100" isEnabled="false" name="JavaScript" />
+        <language isEnabled="false" name="Groovy" />
+        <language isEnabled="false" name="Style Sheets" />
+        <language minSize="70" name="Kotlin" />
+        <language isEnabled="false" name="TypeScript" />
+        <language isEnabled="false" name="ActionScript" />
+      </Languages>
+    </inspection_tool>
     <inspection_tool class="SpellCheckingInspection" enabled="true" level="TYPO" enabled_by_default="true">
       <option name="processCode" value="false" />
       <option name="processLiterals" value="true" />
diff --git a/compiler/res/prog8lib/prog8lib.asm b/compiler/res/prog8lib/prog8lib.asm
index 9e6a878db..bb26e86fb 100644
--- a/compiler/res/prog8lib/prog8lib.asm
+++ b/compiler/res/prog8lib/prog8lib.asm
@@ -1417,7 +1417,7 @@ _l3		ldy  c64.SCRATCH_ZPB1		;where the largest value shall be put
 		rts
 		.pend
 
-		
+
 sort_b		.proc
 		; 8bit signed sort
 		; sorting subroutine coded by mats rosengren (mats.rosengren@esa.int)
@@ -1471,7 +1471,7 @@ _sort_loop	ldy  c64.SCRATCH_ZPB1    	;start of subroutine sort
 		sta  _work3+1
 		dey
 		jmp  _l2
-_l1		dey  
+_l1		dey
 		dey
 		beq  _l3
 		iny
@@ -1506,12 +1506,12 @@ _l3		ldy  c64.SCRATCH_ZPB1           ;where the largest value shall be put
 		dec  c64.SCRATCH_ZPB1           ;end of the shorter sequence still left
 		dec  c64.SCRATCH_ZPB1
 		bne  _sort_loop           ;start working with the shorter sequence
-		rts		
+		rts
 _work1	.byte  0
 _work3	.word  0
 		.pend
 
-		
+
 sort_w		.proc
 		; 16bit signed sort
 		; sorting subroutine coded by mats rosengren (mats.rosengren@esa.int)
@@ -1532,7 +1532,7 @@ _sort_loop	ldy  c64.SCRATCH_ZPB1    	;start of subroutine sort
 		sta  _work3+1
 		dey
 		jmp  _l2
-_l1		dey  
+_l1		dey
 		dey
 		beq  _l3
 		lda  (c64.SCRATCH_ZPWORD1),y
@@ -1543,7 +1543,7 @@ _l1		dey
 		sbc  c64.SCRATCH_ZPWORD2+1
 		bvc  +
 		eor  #$80
-+		bmi  _l1		
++		bmi  _l1
 _l2		sty  _work1          		;index of potentially largest value
 		lda  (c64.SCRATCH_ZPWORD1),y
 		sta  c64.SCRATCH_ZPWORD2          ;potentially largest value
@@ -1568,12 +1568,12 @@ _l3		ldy  c64.SCRATCH_ZPB1           ;where the largest value shall be put
 		dec  c64.SCRATCH_ZPB1           ;end of the shorter sequence still left
 		dec  c64.SCRATCH_ZPB1
 		bne  _sort_loop           ;start working with the shorter sequence
-		rts		
+		rts
 _work1	.byte  0
 _work3	.word  0
-		.pend		
-		
-		
+		.pend
+
+
 reverse_b	.proc
 		; --- reverse an array of bytes (in-place)
 		; inputs:  pointer to array in c64.SCRATCH_ZPWORD1, length in A
@@ -1607,7 +1607,7 @@ _loop		sty  c64.SCRATCH_ZPREG
 		rts
 		.pend
 
-		
+
 reverse_w	.proc
 		; --- reverse an array of words (in-place)
 		; inputs:  pointer to array in c64.SCRATCH_ZPWORD1, length in A
@@ -1669,7 +1669,7 @@ _loop_hi	sty  c64.SCRATCH_ZPREG
 		dey
 		bne  _loop_hi
 
-		rts	
+		rts
 		.pend
 
 ror2_mem_ub	.proc
@@ -1687,7 +1687,7 @@ ror2_mem_ub	.proc
 +		sta  (c64.SCRATCH_ZPWORD1),y
 		rts
 		.pend
-		
+
 rol2_mem_ub	.proc
 		; -- in-place 8-bit rol of byte at memory location on stack
 		;"  lda  ${number.toHex()} |  cmp  #\$80 |  rol  a |  sta  ${number.toHex()}"
@@ -1703,59 +1703,59 @@ rol2_mem_ub	.proc
 		sta  (c64.SCRATCH_ZPWORD1),y
 		rts
 		.pend
-		
+
 lsl_array_b	.proc
 		.warn "lsl_array_b"		; TODO
 		.pend
-		
+
 lsl_array_w	.proc
 		.warn "lsl_array_w"		; TODO
 		.pend
-		
+
 lsr_array_ub	.proc
 		.warn "lsr_array_ub"		; TODO
 		.pend
-		
+
 lsr_array_b	.proc
 		.warn "lsr_array_b"		; TODO
 		.pend
-		
+
 lsr_array_uw	.proc
-		.warn "lsl_array_uw"		; TODO
+		.warn "lsr_array_uw"		; TODO
 		.pend
-		
+
 lsr_array_w	.proc
 		.warn "lsr_array_w"		; TODO
 		.pend
-		
+
 rol_array_ub	.proc
 		.warn "rol_array_ub"		; TODO
 		.pend
-		
+
 rol_array_uw	.proc
 		.warn "rol_array_uw"		; TODO
 		.pend
-		
+
 rol2_array_ub	.proc
 		.warn "rol2_array_ub"		; TODO
 		.pend
-		
+
 rol2_array_uw	.proc
 		.warn "rol2_array_uw"		; TODO
 		.pend
-		
+
 ror_array_ub	.proc
 		.warn "ror_array_ub"		; TODO
 		.pend
-		
+
 ror_array_uw	.proc
 		.warn "ror_array_uw"		; TODO
 		.pend
-		
+
 ror2_array_ub	.proc
 		.warn "ror2_array_ub"		; TODO
 		.pend
-		
+
 ror2_array_uw	.proc
 		.warn "ror2_array_uw"		; TODO
 		.pend
diff --git a/compiler/src/prog8/ast/AstToplevel.kt b/compiler/src/prog8/ast/AstToplevel.kt
index a26b4c0a7..9afd52637 100644
--- a/compiler/src/prog8/ast/AstToplevel.kt
+++ b/compiler/src/prog8/ast/AstToplevel.kt
@@ -176,7 +176,7 @@ class Program(val name: String, val modules: MutableList<Module>) {
     var actualLoadAddress: Int = 0
 
     fun entrypoint(): Subroutine? {
-        val mainBlocks = modules.flatMap { it.statements }.filter { b -> b is Block && b.name=="main" }.map { it as Block }
+        val mainBlocks = allBlocks().filter { it.name=="main" }
         if(mainBlocks.size > 1)
             throw FatalAstException("more than one 'main' block")
         return if(mainBlocks.isEmpty()) {
diff --git a/compiler/src/prog8/compiler/Main.kt b/compiler/src/prog8/compiler/Main.kt
index b2378292e..441285bc5 100644
--- a/compiler/src/prog8/compiler/Main.kt
+++ b/compiler/src/prog8/compiler/Main.kt
@@ -103,7 +103,7 @@ fun compileProgram(filepath: Path,
                 // asm generation directly from the Ast, no need for intermediate code
                 val zeropage = MachineDefinition.C64Zeropage(compilerOptions)
                 programAst.anonscopeVarsCleanup()
-                val assembly = AsmGen(programAst, compilerOptions, zeropage, outputDir).compileToAssembly(optimize)
+                val assembly = AsmGen(programAst, zeropage, compilerOptions, outputDir).compileToAssembly(optimize)
                 assembly.assemble(compilerOptions)
                 programName = assembly.name
             }
diff --git a/compiler/src/prog8/compiler/target/c64/AssemblyProgram.kt b/compiler/src/prog8/compiler/target/c64/AssemblyProgram.kt
index 6c48197d1..fea79476a 100644
--- a/compiler/src/prog8/compiler/target/c64/AssemblyProgram.kt
+++ b/compiler/src/prog8/compiler/target/c64/AssemblyProgram.kt
@@ -5,7 +5,7 @@ import prog8.compiler.OutputType
 import java.nio.file.Path
 import kotlin.system.exitProcess
 
-class AssemblyProgram(val name: String, val outputDir: Path) {
+class AssemblyProgram(val name: String, outputDir: Path) {
     private val assemblyFile = outputDir.resolve("$name.asm")
     private val prgFile = outputDir.resolve("$name.prg")
     private val binFile = outputDir.resolve("$name.bin")
diff --git a/compiler/src/prog8/compiler/target/c64/codegen/AsmGen.kt b/compiler/src/prog8/compiler/target/c64/codegen/AsmGen.kt
index 4775b57c7..4ec908e4d 100644
--- a/compiler/src/prog8/compiler/target/c64/codegen/AsmGen.kt
+++ b/compiler/src/prog8/compiler/target/c64/codegen/AsmGen.kt
@@ -25,10 +25,10 @@ import kotlin.math.absoluteValue
 internal class AssemblyError(msg: String) : RuntimeException(msg)
 
 
-internal class AsmGen(val program: Program,
-                      val options: CompilationOptions,
-                      val zeropage: Zeropage,
-                      val outputDir: Path) {
+internal class AsmGen(private val program: Program,
+                      private val zeropage: Zeropage,
+                      private val options: CompilationOptions,
+                      private val outputDir: Path) {
 
     private val assemblyLines = mutableListOf<String>()
     private val globalFloatConsts = mutableMapOf<Double, String>()     // all float values in the entire program (value -> varname)
diff --git a/compiler/src/prog8/optimizer/SimplifyExpressions.kt b/compiler/src/prog8/optimizer/SimplifyExpressions.kt
index a0e52812c..24f3008bd 100644
--- a/compiler/src/prog8/optimizer/SimplifyExpressions.kt
+++ b/compiler/src/prog8/optimizer/SimplifyExpressions.kt
@@ -11,7 +11,7 @@ import kotlin.math.log2
 import kotlin.math.pow
 
 /*
-    todo advanced expression optimization: common (sub) expression elimination (turn common expressions into single subroutine call + introduce variable to hold it)
+    todo add more expression optimizations
 
     Also see  https://egorbo.com/peephole-optimizations.html
 
diff --git a/compiler/src/prog8/optimizer/StatementOptimizer.kt b/compiler/src/prog8/optimizer/StatementOptimizer.kt
index 22c6690bd..d9ea58b10 100644
--- a/compiler/src/prog8/optimizer/StatementOptimizer.kt
+++ b/compiler/src/prog8/optimizer/StatementOptimizer.kt
@@ -16,8 +16,8 @@ import kotlin.math.floor
 
 
 /*
-    TODO: analyse for unreachable code and remove that (f.i. code after goto or return that has no label so can never be jumped to) + print warning about this
-    TODO: proper inlining of small subroutines (correctly renaming/relocating all variables in them and refs to those as well, or restrict to subs without variables?)
+    TODO: remove unreachable code?
+    TODO: proper inlining of tiny subroutines (correctly renaming/relocating all variables in them and refs to those as well, or restrict to subs without variables?)
 */
 
 
diff --git a/compiler/src/prog8/parser/ModuleParsing.kt b/compiler/src/prog8/parser/ModuleParsing.kt
index 7d0be5153..953fcb3ac 100644
--- a/compiler/src/prog8/parser/ModuleParsing.kt
+++ b/compiler/src/prog8/parser/ModuleParsing.kt
@@ -121,7 +121,7 @@ private fun executeImportDirective(program: Program, import: Directive, source:
     if(existing!=null)
         return null
 
-    val resource = tryGetEmbeddedResource(moduleName+".p8")
+    val resource = tryGetEmbeddedResource("$moduleName.p8")
     val importedModule =
         if(resource!=null) {
             // load the module from the embedded resource
diff --git a/compiler/src/prog8/vm/astvm/AstVm.kt b/compiler/src/prog8/vm/astvm/AstVm.kt
index abcb5e37f..5f36993d8 100644
--- a/compiler/src/prog8/vm/astvm/AstVm.kt
+++ b/compiler/src/prog8/vm/astvm/AstVm.kt
@@ -173,9 +173,9 @@ class AstVm(val program: Program) {
     fun memwrite(address: Int, value: Short): Short {
         if(address==0xa0 || address==0xa1 || address==0xa2) {
             // a write to the jiffy clock, update the clock offset for the irq
-            val timeHi = if(address==0xa0) value else mem.getUByte_DMA(0xa0)
-            val timeMid = if(address==0xa1) value else mem.getUByte_DMA(0xa1)
-            val timeLo = if(address==0xa2) value else mem.getUByte_DMA(0xa2)
+            val timeHi = if(address==0xa0) value else mem.getUByteDirectly(0xa0)
+            val timeMid = if(address==0xa1) value else mem.getUByteDirectly(0xa1)
+            val timeLo = if(address==0xa2) value else mem.getUByteDirectly(0xa2)
             val jiffies = (timeHi.toInt() shl 16) + (timeMid.toInt() shl 8) + timeLo
             rtcOffset = bootTime - (jiffies*1000/60)
         }
@@ -260,9 +260,9 @@ class AstVm(val program: Program) {
             rtcOffset = timeStamp
         }
         // update the C-64 60hz jiffy clock in the ZP addresses:
-        mem.setUByte_DMA(0x00a0, (jiffies ushr 16).toShort())
-        mem.setUByte_DMA(0x00a1, (jiffies ushr 8 and 255).toShort())
-        mem.setUByte_DMA(0x00a2, (jiffies and 255).toShort())
+        mem.setUByteDirectly(0x00a0, (jiffies ushr 16).toShort())
+        mem.setUByteDirectly(0x00a1, (jiffies ushr 8 and 255).toShort())
+        mem.setUByteDirectly(0x00a2, (jiffies and 255).toShort())
     }
 
     private val runtimeVariables = RuntimeVariables()
diff --git a/compiler/src/prog8/vm/astvm/Memory.kt b/compiler/src/prog8/vm/astvm/Memory.kt
index 36dac7f1c..d10b23561 100644
--- a/compiler/src/prog8/vm/astvm/Memory.kt
+++ b/compiler/src/prog8/vm/astvm/Memory.kt
@@ -21,7 +21,7 @@ class Memory(private val readObserver: (address: Int, value: Short) -> Short,
         else mem[address]
     }
 
-    fun getUByte_DMA(address: Int): Short {
+    fun getUByteDirectly(address: Int): Short {
         return mem[address]
     }
 
@@ -39,7 +39,7 @@ class Memory(private val readObserver: (address: Int, value: Short) -> Short,
                 else value
     }
 
-    fun setUByte_DMA(address: Int, value: Short) {
+    fun setUByteDirectly(address: Int, value: Short) {
         if(value !in 0..255)
             throw VmExecutionException("ubyte value out of range $value")
         mem[address] = value