Merge pull request #131 from dcamarmas/master

dcamarmas · web-flow · commit a2fc45cf6bfa · 2023-02-03T16:45:49.000+01:00
3.2.1
diff --git a/architecture/MIPS_32.json b/architecture/MIPS_32.json
diff --git a/architecture/RISC_V_RV32IMFD.json b/architecture/RISC_V_RV32IMFD.json
diff --git a/components/assembly/creator_uielto_load_assembly.js b/components/assembly/creator_uielto_load_assembly.js
@@ -66,7 +66,7 @@
                         hide_loading();
 
                         /* Google Analytics */
-                        creator_ga('assembly', 'assebly.load', 'assebly.load');
+                        creator_ga('assembly', 'assembly.load', 'assembly.load');
                       },
                     },
 
diff --git a/components/assembly/creator_uielto_save_assembly.js b/components/assembly/creator_uielto_save_assembly.js
@@ -64,7 +64,7 @@
                         this.save_assembly = '';
 
                         //Google Analytics
-                        creator_ga('assembly', 'assebly.save', 'assebly.save');
+                        creator_ga('assembly', 'assembly.save', 'assembly.save');
                       },
 
                       //Stop user interface refresh
diff --git a/components/assembly/creator_uielto_shortcuts.js b/components/assembly/creator_uielto_shortcuts.js
@@ -68,8 +68,7 @@
                     ' ' +
                     '     <b-list-group-item class="d-flex justify-content-between align-items-center">' +
                     '       Block code comment &nbsp&nbsp' +
-                    '       <b-badge variant="primary" pill v-if="browser != \'Mac\'"> Ctrl + m</b-badge>' +
-                    '       <b-badge variant="primary" pill v-if="browser == \'Mac\'"> ⌘ + m</b-badge>' +
+                    '       <b-badge variant="primary" pill> Ctrl + m</b-badge>' +
                     '     </b-list-group-item>' +
                     '   </b-list-group>' +
                     ' </b-popover>'
diff --git a/components/general/creator_uielto_about.js b/components/general/creator_uielto_about.js
@@ -72,7 +72,7 @@
                 '   </b-card-group>' +
                 ' ' +
                 '   <b-list-group>' +
-                '     <b-list-group-item style="text-align: center;">Contact: <a href="mailto: creator.arcos.inf.uc3m.es@gmail.com">creator.arcos.inf.uc3m.es@gmail.com</a></b-list-group-item>' +
+                '     <b-list-group-item style="text-align: center;">Contact us: <a href="mailto: creator.arcos.inf.uc3m.es@gmail.com">creator.arcos.inf.uc3m.es@gmail.com</a></b-list-group-item>' +
                 '   </b-list-group>' +
                 ' ' +
                 ' </b-modal>'
diff --git a/components/load_architecture/creator_uielto_preload_architecture.js b/components/load_architecture/creator_uielto_preload_architecture.js
@@ -97,7 +97,7 @@
                         show_notification(e.name + ' architecture has been loaded correctly', 'success');
 
                         // Google Analytics
-                        creator_ga('architecture', 'architecture.loading', 'architectures.loading.customized' + e.name);
+                        creator_ga('architecture', 'architecture.loading', 'architectures.loading.preload_' + e.name);
 
                         return;
                       }
@@ -117,7 +117,7 @@
                       show_notification(e.name + ' architecture has been loaded correctly', 'success');
 
                       // Google Analytics
-                      creator_ga('architecture', 'architecture.loading', 'architectures.loading.customized');
+                      creator_ga('architecture', 'architecture.loading', 'architectures.loading.preload_cache');
 
                       }).fail(function() {
                         hide_loading();
diff --git a/js/min.creator_web.js b/js/min.creator_web.js
diff --git a/run_travis.sh b/run_travis.sh
@@ -250,7 +250,7 @@ done
 
 echo ""
 echo " RISC-V: instructions"
-RV_TEST="001 002 003 004 005 006 007 008 009 010 011 012 013 014 015 016 017 018 019 020 021 022 023 024 025 026 027 028 029 030 031 032 033 034 035 036 037 038 039 040 041 042 043 044 045 046 047 048 049 050 051 052 053 054 055 056 057 058 060 061 062 063 064 065"
+RV_TEST="001 002 003 004 005 006 007 008 009 010 011 012 013 014 015 016 017 018 019 020 021 022 023 024 025 026 027 028 029 030 031 032 033 034 035 036 037 038 039 040 041 042 043 044 045 046 047 048 049 050 051 052 053 054 055 056 057 058 059 060 061 062 063 064 065"
 for I in $RV_TEST;
 do
    echo -n " * ./travis/riscv/instructions/test_riscv_instruction_$I: "
diff --git a/travis/riscv/instructions/test_riscv_instruction_059.out b/travis/riscv/instructions/test_riscv_instruction_059.out
@@ -1,2 +1,3 @@
 
 cr[PC]:0x68; ir[t0,x5]:0x200000; ir[t1,x6]:0x200008; ir[t2,x7]:0x200010; ir[fp,s0,x8]:0x200018; ir[s1,x9]:0x20001c; ir[a0,x10]:0x200020; ir[a7,x17]:0xa; fpr[ft0,f0]:0x4070000000000000; fpr[ft2,f2]:0x40AB320000000000; fpr[ft4,f4]:0x40B5640000000000; fpr[ft6,f6]:0x000000004CB73CE3; fpr[fs0,f8]:0x000000004C82CFE9; fpr[fa0,f10]:0x000000004CA20480; fpr[fa2,f12]:0x0000000046192400; fpr[fa4,f14]:0x0000000046016400; fpr[fa6,f16]:0x0000000046100000; keyboard[0x0]:''; display[0x0]:''; 
+

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,3 @@`
`1`	`1`
`2`	`2`	`cr[PC]:0x68; ir[t0,x5]:0x200000; ir[t1,x6]:0x200008; ir[t2,x7]:0x200010; ir[fp,s0,x8]:0x200018; ir[s1,x9]:0x20001c; ir[a0,x10]:0x200020; ir[a7,x17]:0xa; fpr[ft0,f0]:0x4070000000000000; fpr[ft2,f2]:0x40AB320000000000; fpr[ft4,f4]:0x40B5640000000000; fpr[ft6,f6]:0x000000004CB73CE3; fpr[fs0,f8]:0x000000004C82CFE9; fpr[fa0,f10]:0x000000004CA20480; fpr[fa2,f12]:0x0000000046192400; fpr[fa4,f14]:0x0000000046016400; fpr[fa6,f16]:0x0000000046100000; keyboard[0x0]:''; display[0x0]:'';`
	`3`	`+`