From 440da0eaee0b9d61967d1014a4656e509dd612ca Mon Sep 17 00:00:00 2001
From: jespergravgaard <jesper@balmangravgaard.dk>
Date: Wed, 12 Jun 2019 14:10:36 +0200
Subject: [PATCH] Minor stuff.

---
 .../dk/camelot64/kickc/test/TestPrograms.java   |  6 +++---
 src/test/kc/complex/blackhole/blackhole.kc      | 17 +++++++++--------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/test/java/dk/camelot64/kickc/test/TestPrograms.java b/src/test/java/dk/camelot64/kickc/test/TestPrograms.java
index 27c6f8504..cc253699d 100644
--- a/src/test/java/dk/camelot64/kickc/test/TestPrograms.java
+++ b/src/test/java/dk/camelot64/kickc/test/TestPrograms.java
@@ -58,7 +58,7 @@ public class TestPrograms {
       compileAndCompare("textbox");
    }
 
-   /* TODO: Implemente & / address-of for struct values
+   /* TODO: Implement address-of (&) for struct values
    @Test
    public void testStructPtr12Ref() throws IOException, URISyntaxException {
       compileAndCompare("struct-ptr-12-ref", log());
@@ -117,12 +117,12 @@ public class TestPrograms {
 
    @Test
    public void testStructPtr2() throws IOException, URISyntaxException {
-      compileAndCompare("struct-ptr-2", log());
+      compileAndCompare("struct-ptr-2");
    }
 
    @Test
    public void testStructPtr1() throws IOException, URISyntaxException {
-      compileAndCompare("struct-ptr-1", log());
+      compileAndCompare("struct-ptr-1");
    }
 
    @Test
diff --git a/src/test/kc/complex/blackhole/blackhole.kc b/src/test/kc/complex/blackhole/blackhole.kc
index 1acf5d4fb..1e0e2ae0c 100644
--- a/src/test/kc/complex/blackhole/blackhole.kc
+++ b/src/test/kc/complex/blackhole/blackhole.kc
@@ -24,16 +24,16 @@ const word NOT_FOUND = 0xffff;
 void main() {
 
     // Init processing array
-    for( byte i: 0..7 ) PROCESSING[i] = { 0, 0, NOT_FOUND };
+    for( byte i: 0..NUM_PROCESSING-1 ) PROCESSING[i] = { 0, 0, NOT_FOUND };
 
     // Set-up raster interrupts
     setupRasterIrq(RASTER_IRQ_TOP, &irqTop);
 
     // Fill screen with some chars
-    for( byte* sc: SCREEN..SCREEN+999) *sc = 'a'+(<sc&0x1f);
+    //for( byte* sc: SCREEN..SCREEN+999) *sc = 'a'+(<sc&0x1f);
 
     // Copy screen to screen copy
-    for( byte* src=SCREEN, dst=SCREEN_COPY; src!=SCREEN+999; src++, dst++) *dst = *src;
+    for( byte* src=SCREEN, dst=SCREEN_COPY; src!=SCREEN+1000; src++, dst++) *dst = *src;
 
     // Init squares table
     initSquareTables();
@@ -41,7 +41,7 @@ void main() {
     // Main loop
     do {
         // Look for the non-space closest to the screen center
-        struct ProcessingChar center = getCenterChar();
+        struct ProcessingChar center = getCharToProcess();
         if(center.dist==NOT_FOUND)
             break;
         startProcessing(center);
@@ -52,15 +52,16 @@ void main() {
 
 }
 
+const byte NUM_PROCESSING = 16;
 // Chars currently being processed in the interrupt
-struct ProcessingChar[8] PROCESSING;
+struct ProcessingChar[NUM_PROCESSING] PROCESSING;
 
 // Start processing a char - by inserting it into the PROCESSING array
 void startProcessing(struct ProcessingChar center) {
     // Busy-wait while finding an empty slot in the PROCESSING array
     byte freeIdx = 0xff;
     do {
-        for( byte i: 0..7 ) {
+        for( byte i: 0..NUM_PROCESSING-1 ) {
             if(PROCESSING[i].dist==NOT_FOUND) {
                 freeIdx = i;
                 break;
@@ -74,7 +75,7 @@ void startProcessing(struct ProcessingChar center) {
 
 // Process any chars in the PROCESSING array
 void processChars() {
-    for( byte i: 0..7 ) {
+    for( byte i: 0..NUM_PROCESSING-1 ) {
         if(PROCESSING[i].dist!=NOT_FOUND) {
             struct ProcessingChar processing = PROCESSING[i];
             *(COLS+(word)processing.y*40+processing.x) = WHITE;
@@ -108,7 +109,7 @@ void initSquareTables() {
 
 // Find the non-space char closest to the center of the screen
 // If no non-space char is found the distance will be 0xffff
-struct ProcessingChar getCenterChar() {
+struct ProcessingChar getCharToProcess() {
     struct ProcessingChar closest = { 0, 0, NOT_FOUND };
     byte* screen_line = SCREEN_COPY;
     for( byte y: 0..24) {