Some fixes in the file interpret command and the www

Fix loading of omap3830 script (support longer calc expressions) Fix some glitches and TODOs in the www ui
2012-10-31 10:42:49 +01:00 · 2012-10-31 10:42:49 +01:00 · 8431655bf8
parent c72d2043c2
commit 8431655bf8
6 changed files with 66 additions and 57 deletions
--- a/libr/core/cmd.c
+++ b/libr/core/cmd.c
@ -1086,7 +1086,7 @@ R_API int r_core_cmd(RCore *core, const char *cstr, int log) {
 R_API int r_core_cmd_file(RCore *core, const char *file) {
 	int ret = R_TRUE;
 	char *nl, *data, *odata = r_file_slurp (file, NULL);
-	if (!odata) return -2;
+	if (!odata) return R_FALSE;
 	nl = strchr (odata, '\n');
 	if (nl) {
 		data = odata;
@ -1108,7 +1108,7 @@ R_API int r_core_cmd_file(RCore *core, const char *file) {
 		} while ((nl = strchr (data, '\n')));
 	}
 	free (odata);
-	return ret;
+	return R_TRUE;
 }

 R_API int r_core_cmd_command(RCore *core, const char *command) {
--- a/libr/include/r_util.h
+++ b/libr/include/r_util.h
@ -102,7 +102,7 @@ typedef struct r_prof_t {
 } RProfile;

 /* numbers */
-#define R_NUMCALC_STRSZ 128
+#define R_NUMCALC_STRSZ 4096

 typedef struct {
 	double d;
--- a/libr/util/calc.c
+++ b/libr/util/calc.c
@ -140,7 +140,7 @@ static int cin_get(RNum *num, RNumCalc *nc, char *c) {

 static int cin_get_num(RNum *num, RNumCalc *nc, RNumCalcValue *n) {
 	double d;
-	char str[128];
+	char str[R_NUMCALC_STRSZ];
 	int i = 0;
 	char c;
 	str[0] = 0;
--- a/shlr/arm/omap3430_registers
+++ b/shlr/arm/omap3430_registers
@ -282,11 +282,11 @@ f OMAP3430_reg_CONTROL_PROT_ERR_STATUS 4 @OMAP3430_SCM_BASE+0x2E4 Protection Err
 f OMAP3430_reg_CONTROL_PROT_ERR_STATUS_DEBUG 4 @OMAP3430_SCM_BASE+0x2E8 Protection Error Status Debug Register
 f OMAP3430_reg_CONTROL_STATUS 4 @OMAP3430_SCM_BASE+0x2F0 Control Module Status register: latches system information at reset time
 f OMAP3430_reg_CONTROL_GENERAL_PURPOSE_STATUS 4 @OMAP3430_SCM_BASE+0x2F4
-f OMAP3430_reg_CONTROL_RPUB_KEY_H_0 4 @OMAP3430_SCM_BASE+0x300 Root public key hash; B-field
-f OMAP3430_reg_CONTROL_RPUB_KEY_H_1 4 @OMAP3430_SCM_BASE+0x304 Root public key hash; B-field
-f OMAP3430_reg_CONTROL_RPUB_KEY_H_2 4 @OMAP3430_SCM_BASE+0x308 Root public key hash; B-field
-f OMAP3430_reg_CONTROL_RPUB_KEY_H_3 4 @OMAP3430_SCM_BASE+0x30C Root public key hash; B-field
-f OMAP3430_reg_CONTROL_RPUB_KEY_H_4 4 @OMAP3430_SCM_BASE+0x310 Root public key hash; B-field
+f OMAP3430_reg_CONTROL_RPUB_KEY_H_0 4 @OMAP3430_SCM_BASE+0x300 Root public key hash: B-field
+f OMAP3430_reg_CONTROL_RPUB_KEY_H_1 4 @OMAP3430_SCM_BASE+0x304 Root public key hash: B-field
+f OMAP3430_reg_CONTROL_RPUB_KEY_H_2 4 @OMAP3430_SCM_BASE+0x308 Root public key hash: B-field
+f OMAP3430_reg_CONTROL_RPUB_KEY_H_3 4 @OMAP3430_SCM_BASE+0x30C Root public key hash: B-field
+f OMAP3430_reg_CONTROL_RPUB_KEY_H_4 4 @OMAP3430_SCM_BASE+0x310 Root public key hash: B-field
 f OMAP3430_reg_CONTROL_USB_CONF_0 4 @OMAP3430_SCM_BASE+0x370 USB Fuse conf [31:0], USB Product ID [31:16], Vendor ID [15:0]
 f OMAP3430_reg_CONTROL_USB_CONF_1 4 @OMAP3430_SCM_BASE+0x374 USB Fuse conf 1, SEQ_DISADAPTCLK[1], USB PHY detection mode [0]
 f OMAP3430_reg_CONTROL_FUSE_OPP1_VDD1 4 @OMAP3430_SCM_BASE+0x380 Standard Fuse OPP1 VDD1
@ -541,7 +541,7 @@ f OMAP3430_reg_PRM_CLKSETUP 4 @OMAP3430_PRM_BASE+0x1298 This register allows set
 f OMAP3430_reg_PRM_POLCTRL 4 @OMAP3430_PRM_BASE+0x129C This register allows setting the polarity of device outputs control signals
 f OMAP3430_reg_PRM_VOLTSETUP2 4 @OMAP3430_PRM_BASE+0x12A0 This register allows setting the overall setup time of VDD1 and VDD2 regulators. This register is used when exiting OFF mode and when the Power IC manages the sequencing of the voltages regulation steps

-// Here is an Secret Register Array. All information about them not available in public domain
+# Here is an Secret Register Array. All information about them not available in public domain

 f OMAP3430_reg_RM_RSTST_NEON 4 @OMAP3430_PRM_BASE+0x1358 This register logs the different reset sources of the NEON domain. Each bit is set upon release of the domain reset signal. Must be cleared by software
 f OMAP3430_reg_PM_WKDEP_NEON 4 @OMAP3430_PRM_BASE+0x13C8 This register allows enabling or disabling the wake-up of the NEON domain upon another domain
--- a/shlr/www/index.html
+++ b/shlr/www/index.html
@ -129,11 +129,6 @@ function show_popup_about () {
 		"<a href=\"javascript:toggle('asm.pseudo')\" />asm.pseudo</a><br />"+
 		"<a href=\"javascript:toggle('asm.bytes')\" />asm.bytes</a><br />"+
 		"<a href=\"javascript:toggle('cfg.bigendian')\" />cfg.bigendian</a><br />"+
-/*
-asm.arch
-asm.bits
-a
-*/
 		"&nbsp;"+
 		"<br />"+
 		"Actions"+
@ -266,7 +261,6 @@ function filter_asm(x) {
 		}
 	} else hasmore (true);

-	x = x.replace (/0x([a-zA-Z0-9]*)/g, "<a href='javascript:seek(\"0x$1\")'>0x$1</a>");
 	function haveDisasm(x) {
 		if (x[0]=='p' && x[1]=='d') return true;
 		if (x.indexOf (";pd") != -1) return true;
@ -275,16 +269,17 @@ function filter_asm(x) {
 	if (haveDisasm (display)) {
 		x = x.replace (/;(\s+)/g, ";");
 		x = x.replace (/;(.*)/g, "// <span style='color:yellow'>$1</span>");
-		x = x.replace (/(fcn|imp|loc).(.*)/g, "<a href='javascript:seek(\"$1.$2\")'>$1.$2</a>");
 		x = x.replace (/(bl|call)/g, "<b style='color:green'>call</b>");
-		x = x.replace (/(jmp|jnz|jg|je|jl|jz|jb|ja|jne)/g, "<b style='color:green'>$1</b>");
+		x = x.replace (/(jmp|bne|beq|jnz|jg|je|jl|jz|jb|ja|jne)/g, "<b style='color:green'>$1</b>");
 		x = x.replace (/(leave|ret)/g, "<b style='color:red'>$1</b>");
 		x = x.replace (/(add|sub|mul|div|shl|shr|and|not|xor|inc|dec|sar|sal)/g, "<b style='color:orange'>$1</b>");
 		x = x.replace (/(push|pop)/g, "<b style='color:magenta'>$1</b>");
 		x = x.replace (/(mov|lea)/g, "<b style='color:yellow'>$1</b>");
 		x = x.replace (/(test|cmp)/g, "<b style='color:green'>$1</b>");
 		x = x.replace (/nop/g, "<b style='color:blue'>nop</b>");
+		x = x.replace (/(sym|fcn|imp|loc).(.*)/g, "<a href='javascript:seek(\"$1.$2\")'>$1.$2</a>");
 	}
+	x = x.replace (/0x([a-zA-Z0-9]*)/g, "<a href='javascript:seek(\"0x$1\")'>0x$1</a>");
 	if (backward) {
 		prev_curoff = curoff;
 		prev_lastoff = lastoff;
@ -361,11 +356,13 @@ function popup_show (title, body) {
 		t.innerHTML = title;
 	if (body) {
 		var top = document.body.scrollTop+10;
+		var left = document.body.scrollLeft+10;
 		c.innerHTML = body;
 		p.style.visibility =
 		b.style.visibility = "visible";
 		//c.style.top = top; /* XXX doesnt works */
 		css ('.popup', 'top', top+"px"); //'220px');
+		css ('.popup', 'left', left+"px"); //'220px');
 	}
 	b.height = 100;
 }
@ -388,18 +385,41 @@ function toggle_editor() {
 	var em = document.getElementById('editor_menu');
 	if (et.style.visibility=="hidden") {
 		e.style.width = 300;
-		et.style.visibility="visible";
-		em.style.visibility="visible";
+		et.style.visibility=em.style.visibility="visible";
 		x.innerHTML = "x";
 	} else {
 		e.style.width = 16;
-		et.style.visibility="hidden";
-		em.style.visibility="hidden";
+		et.style.visibility=em.style.visibility="hidden";
 		x.innerHTML = "&lt;";
 	}
 	
 }

+function notepad_run() {
+	var t = document.getElementById ('editor_textarea').value;
+	cmd (t.replace (/\n/g, ';'), function (out) {
+		document.getElementById ('editor_textarea').value = out;
+	});
+}
+
+function notepad_assemble () {
+	var t = document.getElementById ('editor_textarea').value;
+	cmd ("\"pa "+t.replace (/\n/g, ';')+"\"", function (out) {
+		document.getElementById ('editor_textarea').value = out;
+	});
+}
+
+function notepad_disassemble () {
+	var t = document.getElementById ('editor_textarea').value;
+	cmd ("pi@b:"+t.replace (/\n/g, ''), function (out) {
+		document.getElementById ('editor_textarea').value = out;
+	});
+}
+
+function notepad_clear() {
+	document.getElementById ('editor_textarea').value = '';
+}
+
 function init() {
 	var input = document.getElementById ('input');
 	input.addEventListener ("activate", function (x) {
@ -424,7 +444,6 @@ var r2 = {
 	'config_get': function (x,y) { cmd ('e '+x, y); },
 	'config_set': function (x) { runcmd ('s entry0'); }
 }
-
 </script>
 </head>
 <body id="body" onload="init()">
@ -435,7 +454,7 @@ var r2 = {
 <a href="javascript:r2.incode()">pc</a>
 |
 <a href="javascript:r2.entry()">entry</a>
-<a href="javascript:r2.analyze()">analyze</a>
+<a href="javascript:r2.analyze()">a</a>
 |
 <a href="javascript:r2.break()">break</a>
 <a href="javascript:r2.step()">step</a>
@ -449,9 +468,10 @@ var r2 = {
 <a title="toggle notepad" id="x" href="javascript:toggle_editor ()">&lt;</a>
 </td><td>
 <div id="editor_menu">
-<a title="execute selected text" href="javascript:alert('TODO')">run</a>
-<a title="assemble selected text" href="javascript:alert('TODO')">asm</a>
-<a title="disassemble selected text" href="javascript:alert('TODO')">dis</a>
+<a title="execute selected text" href="javascript:notepad_run()">run</a>
+<a title="assemble selected text" href="javascript:notepad_assemble()">asm</a>
+<a title="disassemble selected text" href="javascript:notepad_disassemble()">dis</a>
+<a title="disassemble selected text" href="javascript:notepad_clear()">clr</a>
 </div>
 </td></tr></table>
 <textarea id="editor_textarea" class="editor_textarea" style="visibility:hidden">
@ -468,42 +488,27 @@ var r2 = {
 </tr>
 <tr>
 	<td colspan=2 valign="top" style="light">
-<div class="popup_content" id="popup_content">
-This is the r2w2 ui. A rewrite in pure C/js of the original r2w written in python.
-<br /><br />
-This interface aims to run on every modern browser; from Android/iPhone/iPad to desktop browsers (Chromium, Firefox, ..)
-<br /><br />
-The UI is under heavy development. This is the first release and there will probably be lot of bugs and caveats. Feel free to report on <a href="http://github.com/radare/radare2">github</a> patches, ideas or bug reports.
-<br /><br />
-Enjoy!
-	</div>
+		<div class="popup_content" id="popup_content"> </div>
 	</td>
 </tr>
 </table>
 </div>

 <div style="position:fixed; top:0px;left:0px;background-color:black;border:0px">
-<table class=header>
-<tr>
-	<td style="text-align:left;vertical-align:top">
+	<table class=header>
+	<tr><td style="text-align:left;vertical-align:top">
 		<a href="javascript:show_popup_about ()"><img border=0 src="rlogo2.png" /></a>
-</td> <td align="right" style="width:100%">
+	</td><td align="right" style="width:100%">
 		<input style="width:100%" onkeypress="handleKeyPress(event)" id="input">
-</td> </tr> 
-</table>
-
+	</td></tr> 
+	</table>
 </div>

 <div onresize="menubar_display()" id="console" class="console" style="top:45px !important; position:absolute;z-index:-99">
-<div id="less">
-	<a href='javascript:less()'>... prev</a>
-</div>
+<div id="less" class="scroller" onclick="less()"> &nbsp;&nbsp;^^^ </div>
 <p id="output"></p>
-<div id="more">
-	<a href='javascript:more()'>... next</a>
-<br /><br /><br />
-</div>
+<div id="more" class="scroller" onclick="more()"> &nbsp;&nbsp;vvv </div>
+<br /> <br /> 
 </div>
 </body>
 </html>
-
--- a/shlr/www/style.css
+++ b/shlr/www/style.css
@ -143,12 +143,16 @@ a {
 }

 .editor_textarea {
-	opacity:0.5;
 	visibility: hidden;
-	filter:alpha(opacity=70);
-	background-color:yellow;
+	background-color:#303030;
 	width:95%;
 	height:100%;
 	font-family: Courier;
-	color: black;
+	color: white;
+}
+
+.scroller {
+	width:100%;
+	background-color:#404080;
+	cursor: pointer;
 }