Bug Fixes for #124 and #125

* Bug fixes for#125 and #124
* Renamed Files
* Removed return condition
* Bug fixes for #125 and #124 and renamed files
* Added PAVA Option in Core/IO
* Added View Graph in Contextual Menu Disasm

www/m/js/core/R2Wrapper.js

@@ -82,7 +82,9 @@ const SettingItems = {
 	ANAL_NON_CODE: 'analNonCode',
 	COLORS: 'colors',
 	USE_TTS: 'useTTS',
-	THEME: 'theme'
+	THEME: 'theme',
+	ASMEMU: 'asmemu',
+	ASMEMUSTR: 'asmemustr'
 };
 
 
@@ -95,6 +97,8 @@ r2Conf[SettingItems.UCASE] = { name: 'ucase', defVal: 'false', apply: function(p
 r2Conf[SettingItems.DESCRIBE] = { name: 'describe', defVal: 'false', apply: function(p) { r2.cmd('e asm.describe=' + p); } };
 r2Conf[SettingItems.BYTES] = { name: 'bytes', defVal: 'false', apply: function(p) { r2.cmd('e asm.bytes=' + p); } };
 r2Conf[SettingItems.OS] = { name: 'os', defVal: 'Linux', apply: function(p) { console.log('OS is now: ' + p); } }; // missing
+r2Conf[SettingItems.ASMEMU] = { name: 'asmemu', defVal: 'false', apply: function(p) {  r2.cmd('e asm.emu=' + p); } };
+r2Conf[SettingItems.ASMEMUSTR] = { name: 'asmemustr', defVal: 'false', apply: function(p) { r2.cmd('e asm.emustr=' + p); } };
 r2Conf[SettingItems.SIZE] = { name: 'size', defVal: 'S', apply: function(p) {
 	switch (p) {
 	case 'S':
@@ -136,13 +140,19 @@ r2Conf[SettingItems.MODE] = { name: 'mode', defVal: 'PA', apply: function(p) {
 	switch (p) {
 	case 'PA':
 		r2.cmd('e io.va=false');
+		r2.cmd('e io.pava=false');
 		break;
 	case 'VA':
 		r2.cmd('e io.va=true');
+		r2.cmd('e io.pava=false');
+		break;
+	case 'PAVA':
+		r2.cmd('e io.pava=true');
 		break;
 	case 'Debug':
 		r2.cmd('e io.va=true');
 		r2.cmd('e io.debug=true');
+		r2.cmd('e io.pava=false');
 		break;
 	};
 }};

www/m/js/core/UIContext.js

@@ -1,5 +1,5 @@
 import {Layouts} from '../layout/Layouts';
-import {Ruler} from '../layout/ruler';
+import {Ruler} from '../layout/Ruler';
 
 // Determine maximum widget displayable at same time
 const MAX_WIDGETS = 2;

www/m/js/modules/disasm/Disassembly.js

@@ -152,6 +152,16 @@ export class Disassembly extends RadareInfiniteBlock {
 					r2.cmd('e anal.calls=false');
 				}
 			}
+		},{
+			name: 'Analyse reference',
+			ugly: 'ref',
+			active: false,
+			action: function(active) {
+				if (!active) {
+					return;
+				}
+				r2.cmd('aar');
+			}
 		},{
 			name: 'Emulate code',
 			ugly: 'code',
@@ -168,9 +178,6 @@ export class Disassembly extends RadareInfiniteBlock {
 			ugly: 'preludes',
 			active: false,
 			action: function(active) {
-				if (!active) {
-					return;
-				}
 				r2.cmd('aap');
 			}
 		},{
@@ -625,6 +632,7 @@ export class Disassembly extends RadareInfiniteBlock {
 			// { name: 'define flag color (fc)', shortcut: 'C', fct: function(evt, offset) { return applyOp(offset, 'C'); } },
 			// { name: 'set as data', shortcut: 'd', fct: function(evt, offset) { return applyOp(offset, 'd'); } },
 			// { name: 'end of function', shortcut: 'e', fct: function(evt, offset) { return applyOp(offset, 'e'); } },
+			{ aoj: false, name: 'view graph', shortcut: 'G', fct: function loadgraph() { return uiContext.navigateTo(Widgets.DISASSEMBLY_GRAPH);}},
 			{ aoj: false, name: 'analyze function', shortcut: 'F', fct: function(evt, offset) { return applyOp(offset, 'af'); } },
 			// { name: 'format', shortcut: 'F', fct: function(evt, offset) { return applyOp(offset, 'F'); } },
 			{ aoj: true, name: 'immediate base...', shortcut: 'i', expand: [

www/m/js/modules/overview/AnalysisCard.js

@@ -6,6 +6,7 @@ export class AnalysisCard {
 	constructor() {
 		this.analysisMethods = [
 			{ id: 'symbols', name: 'Analyse symbols', cmd: 'aa' },
+			{ id: 'ref', name: 'Analyse References', cmd: 'aar' },
 			{ id: 'calls', name: 'Analyse calls', cmd: 'e anal.calls=true;aac', disabledCmd: 'e anal.calls=false'  },
 			{ id: 'emu', name: 'Emulate code', cmd: 'e asm.emu=1;aae;e asm.emu=0', disabledCmd: 'e asm.emu=false' },
 			{ id: 'prelude', name: 'Find preludes', cmd: 'aap' },

www/m/js/widgets/SettingsWidget.js

@@ -28,6 +28,7 @@ export class SettingsWidget extends BaseWidget {
 		this.addGrid('Colors', (dom) => this.drawColors(dom));
 		this.addGrid('TTS', (dom) => this.drawTTS(dom));
 		this.addGrid('Reset configuration', (dom) => this.drawReset(dom));
+		this.addGrid('Emulator', (dom) => this.drawEmulator(dom));
 
 		componentHandler.upgradeDom();
 	}
@@ -75,8 +76,17 @@ export class SettingsWidget extends BaseWidget {
 		});
 	}
 
+	drawEmulator(dom){
+		uiSwitch(dom, 'Enable ESIL', r2Settings.getItem(r2Settings.keys.ASMEMU), function(param, state) {
+			r2Settings.setItem(r2Settings.keys.ASMEMU, state);
+		});
+		uiSwitch(dom, 'Enable ESIL (Lesser Verbose)', r2Settings.getItem(r2Settings.keys.ASMEMUSTR), function(param, state) {
+			r2Settings.setItem(r2Settings.keys.ASMEMUSTR, state);
+		});
+	}
+
 	drawCoreIO(dom) {
-		var mode = ['PA', 'VA', 'Debug'];
+		var mode = ['PA', 'VA', 'PAVA', 'Debug'];
 		uiSelect(dom, 'Mode', mode, mode.indexOf(r2Settings.getItem(r2Settings.keys.MODE)), function(item) {
 			r2Settings.setItem(r2Settings.keys.MODE, item);
 		});