Merge PR #11: Implement SomSom - A Metacircular SOM

.github/workflows/ci.yml

@@ -15,6 +15,11 @@ jobs:
         run: |
           ant test
       
+      - name: SomSom Tests
+        run: |
+          ./som.sh -cp core-lib/Smalltalk:core-lib/TestSuite:core-lib/SomSom/src/compiler:core-lib/SomSom/src/vm:core-lib/SomSom/src/vmobjects:core-lib/SomSom/src/interpreter:core-lib/SomSom/src/primitives \
+            core-lib/SomSom/tests/SomSomTests.som
+
       - name: CheckStyle
         run: |
           ant checkstyle
@@ -25,8 +30,7 @@ jobs:
           export ECLIPSE_URL=https://ftp.halifax.rwth-aachen.de/eclipse/eclipse/downloads/drops4/R-4.17-202009021800/eclipse-SDK-4.17-linux-gtk-x86_64.tar.gz
           wget ${ECLIPSE_URL} -O ${ECLIPSE_TAR}
           tar -C ${GITHUB_WORKSPACE}/.. -xzf ${ECLIPSE_TAR}
-          
-      
+
       - name: Check Eclipse Format
         run: |
           export ECLIPSE_EXE=${GITHUB_WORKSPACE}/../eclipse/eclipse

.gitlab-ci.yml

@@ -13,6 +13,7 @@ som:
   script:
     - ant test
     - ./som.sh -cp ./Smalltalk ./TestSuite/TestHarness.som
+    - ./som.sh -cp core-lib/Smalltalk:core-lib/TestSuite:core-lib/SomSom/src/compiler:core-lib/SomSom/src/vm:core-lib/SomSom/src/vmobjects:core-lib/SomSom/src/interpreter:core-lib/SomSom/src/primitives core-lib/SomSom/tests/SomSomTests.som
     - ant checkstyle
 
     - rebench --experiment="CI ID $CI_PIPELINE_ID" --branch="$CI_COMMIT_REF_NAME" -c rebench.conf all

rebench.conf

@@ -13,7 +13,7 @@ reporting:
         project_name: SOM
 
 runs:
-    max_invocation_time: 60
+    max_invocation_time: 120
 
 benchmark_suites:
     macro:
@@ -53,9 +53,25 @@ benchmark_suites:
             - FieldLoop:    {extra_args: 1}
             - WhileLoop:    {extra_args: 10}
             - Mandelbrot:   {extra_args: 30}
+
+    micro-somsom:
+        gauge_adapter: RebenchLog
+        command: "-cp Smalltalk:Examples/Benchmarks/LanguageFeatures Examples/Benchmarks/BenchmarkHarness.som %(benchmark)s %(iterations)s 0 "
+        iterations: 1
+        benchmarks:
+            - Loop:         {extra_args: 1}
+            - Queens:       {extra_args: 1}
+            - List:         {extra_args: 1}
+            - Recurse:      {extra_args: 1}
+            - Mandelbrot:   {extra_args: 3}
 
 executors:
     som:  {path: ., executable: som.sh}
+    somsom:
+        path: .
+        executable: som.sh
+        args: "-cp core-lib/Smalltalk:core-lib/TestSuite:core-lib/SomSom/src/compiler:core-lib/SomSom/src/vm:core-lib/SomSom/src/vmobjects:core-lib/SomSom/src/interpreter:core-lib/SomSom/src/primitives core-lib/SomSom/src/vm/Main.som"
+
 
 # define the benchmarks to be executed for a re-executable benchmark run
 experiments:
@@ -66,3 +82,9 @@ experiments:
             - macro
         executions:
             - som
+    SomSom:
+        description: Running a few SomSom benchmarks on SOM (Java)
+        suites:
+            - micro-somsom
+        executions:
+            - somsom

src/som/vm/Universe.java

@@ -30,6 +30,7 @@
 
 import java.io.IOException;
 import java.math.BigInteger;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.StringTokenizer;
@@ -127,13 +128,15 @@ public void errorExit(final String message) {
     exit(1);
   }
 
-  private String[] handleArguments(String[] arguments) {
+  private String[] handleArguments(final String[] arguments) {
     boolean gotClasspath = false;
-    String[] remainingArgs = new String[arguments.length];
-    int cnt = 0;
+    ArrayList<String> remainingArgs = new ArrayList<>();
+
+    // read dash arguments only while we haven't seen other kind of arguments
+    boolean sawOthers = false;
 
     for (int i = 0; i < arguments.length; i++) {
-      if (arguments[i].equals("-cp")) {
+      if (arguments[i].equals("-cp") && !sawOthers) {
         if (i + 1 >= arguments.length) {
           printUsageAndExit();
         }
@@ -142,10 +145,11 @@ private String[] handleArguments(String[] arguments) {
         ++i; // skip class path
         // Checkstyle: resume
         gotClasspath = true;
-      } else if (arguments[i].equals("-d")) {
+      } else if (arguments[i].equals("-d") && !sawOthers) {
         dumpBytecodes = true;
       } else {
-        remainingArgs[cnt++] = arguments[i];
+        sawOthers = true;
+        remainingArgs.add(arguments[i]);
       }
     }
 
@@ -154,25 +158,21 @@ private String[] handleArguments(String[] arguments) {
       classPath = setupDefaultClassPath(0);
     }
 
-    // Copy the remaining elements from the original array into the new
-    // array
-    arguments = new String[cnt];
-    System.arraycopy(remainingArgs, 0, arguments, 0, cnt);
+    // check first of remaining args for class paths, and strip file extension
 
-    // check remaining args for class paths, and strip file extension
-    for (int i = 0; i < arguments.length; i++) {
-      String[] split = getPathClassExt(arguments[i]);
+    if (!remainingArgs.isEmpty()) {
+      String[] split = getPathClassExt(remainingArgs.get(0));
 
       if (!("".equals(split[0]))) { // there was a path
         String[] tmp = new String[classPath.length + 1];
         System.arraycopy(classPath, 0, tmp, 1, classPath.length);
         tmp[0] = split[0];
         classPath = tmp;
       }
-      arguments[i] = split[1];
+      remainingArgs.set(0, split[1]);
     }
 
-    return arguments;
+    return remainingArgs.toArray(new String[remainingArgs.size()]);
   }
 
   // take argument of the form "../foo/Test.som" and return