Backporting from concurrent project

web/core/Disassembler.js

@@ -139,7 +139,7 @@ class Disassembler {
     ];
 
     // Program register names
-    static PRONAMES = [
+    static REG_PROGRAM = [
         "r0" , "r1" , "hp" , "sp" , "gp" , "tp" , "r6" , "r7" ,
         "r8" , "r9" , "r10", "r11", "r12", "r13", "r14", "r15",
         "r16", "r17", "r18", "r19", "r20", "r21", "r22", "r23",
@@ -147,13 +147,16 @@ class Disassembler {
     ];
 
     // System register names
-    static SYSNAMES = [
+    static REG_SYSTEM = [
         "EIPC", "EIPSW", "FEPC", "FEPSW", "ECR", "PSW", "PIR", "TKCW",
         "8"   , "9"    , "10"  , "11"   , "12" , "13" , "14" , "15"  ,
         "16"  , "17"   , "18"  , "19"   , "20" , "21" , "22" , "23"  ,
         "CHCW", "ADTRE", "26"  , "27"   , "28" , "29" , "30" , "31"
     ];
 
+    // Other register names
+    static REG_OTHER = [ "PC", "PSW" ];
+
 
 
     ///////////////////////////// Static Methods //////////////////////////////
@@ -522,7 +525,8 @@ class Disassembler {
 
     // Format a program register
     programRegister(index) {
-        let ret = this.proNames ? Disassembler.PRONAMES[index] : "r" + index;
+        let ret = this.proNames ?
+            Disassembler.REG_PROGRAM[index] : "r" + index;
         if (this.proUppercase)
             ret = ret.toUpperCase();
         return ret;
@@ -531,7 +535,7 @@ class Disassembler {
     // Format a system register
     systemRegister(index) {
         let ret = this.sysNames ?
-            Disassembler.SYSNAMES[index] : index.toString();
+            Disassembler.REG_SYSTEM[index] : index.toString();
         if (!this.sysUppercase && this.sysNames)
             ret = ret.toLowerCase();
         return ret;