Magic-Mirror/radare2
1
0
Fork 0
mirror of https://github.com/radareorg/radare2.git synced 2025-02-04 12:36:30 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Enhace graphs and handle relocs in webui

Browse Source
This commit is contained in:
pancake 2013-10-09 02:53:25 +02:00
parent d100e603c9
commit f5188d6d47
8 changed files with 115 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libr/core/bin.c
View File

@ -389,17 +389,17 @@ static int bin_relocs (RCore *r, int mode, ut64 baddr, int va) {
r_cons_printf ("[");
r_list_foreach (relocs, iter, reloc) {
if (reloc->import)
r_cons_printf ("%s{\"name\":\"%s\",", iter->p?",":"");
r_cons_printf ("%s{\"name\":\"%s\",", iter->p?",":"", reloc->import->name);
else
r_cons_printf ("%s{\"name\":null,", iter->p?",":"");
r_cons_printf ("\"type\":\"%s\","
"\"addend\":%"PFMT64d","
"\"offset\":%"PFMT64d"}",
iter->p?",":"",
reloc->import->name,
"\"offset\":%"PFMT64d","
//"\"addend\":%"PFMT64d","
"\"physical\":%"PFMT64d"}",
bin_reloc_type_name (reloc),
reloc->addend,
baddr+reloc->rva);
baddr+reloc->rva,
//reloc->addend,
reloc->offset);
}
r_cons_printf ("]");
} else

5
libr/core/cmd.c
View File

@ -1507,12 +1507,9 @@ R_API int r_core_flush(void *user, const char *cmd) {
R_API char *r_core_cmd_str_pipe(RCore *core, const char *cmd) {
char *s, *tmp;
eprintf ("SANDBOXED PIPE (%s)\n", cmd);
r_sandbox_disable (1);
if (r_sandbox_enable (0)) {
r_sandbox_disable (0);
if (r_sandbox_enable (0))
return r_core_cmd_str (core, cmd);
}
r_cons_reset ();
if (r_file_mkstemp ("cmd", &tmp)) {
char *_cmd = strdup (cmd);

1
libr/core/cmd_info.c
View File

@ -136,6 +136,7 @@ static int cmd_info(void *data, const char *input) {
" il ; libraries\n"
" is ; symbols\n"
" iS ; sections\n"
" ir ; relocs\n"
" iz ; strings\n");
break;
case '*': mode = R_CORE_BIN_RADARE;

2
shlr/www/enyo/index.js
View File

File diff suppressed because one or more lines are too long

5
shlr/www/enyo/js/r2.js
View File

@ -96,6 +96,11 @@ r2.get_info = function (cb) {
cb (JSON.parse (json));
});
}
r2.bin_relocs = function (cb) {
r2.cmd ("irj", function (json) {
cb (JSON.parse (json));
});
}
r2.bin_imports = function (cb) {
r2.cmd ("iij", function (json) {
cb (JSON.parse (json));

6
shlr/www/enyo/js/rightpanel.js
View File

@ -24,6 +24,7 @@ enyo.kind ({
{content: "strings", value: "1"},
{content: "symbols", value: "1"},
{content: "imports", value: "1"},
{content: "relocs", value: "1"},
{content: "functions", value: "1"},
{content: "comments", value: "1"},
{classes: "onyx-menu-divider"},
@ -122,6 +123,11 @@ enyo.kind ({
self.$.output.setContent (makelist (x));
});
break;
case "relocs":
r2.bin_relocs (function (x) {
self.$.output.setContent (makelist (x));
});
break;
case "imports":
r2.bin_imports (function (x) {
self.$.output.setContent (makelist (x));

4
shlr/www/graph/index.html
View File

@ -19,6 +19,10 @@ body {
window.onresize = function () {
resizeCanvas ();
}
function resizeBlocks() {
}
function Ajax (method, uri, body, fn) {
var x = new XMLHttpRequest ();
x.open (method, uri, false);

151
shlr/www/graph/js-graph-it.js
View File

@ -106,8 +106,7 @@ function movemouse(e) {
elementToMove.style.right = null;
elementToMove.style.bottom = null;
var i;
for(i = 0; i < blocksToMove.length; i++) {
for (var i = 0; i < blocksToMove.length; i++) {
if (blocksToMove[i])
blocksToMove[i].onMove();
}
@ -296,39 +295,32 @@ function Canvas(htmlElement) {
this.innerDiv.style.height = this.height + "px";
// init connectors
for(i = 0; i < this.connectors.length; i++)
{
for(i = 0; i < this.connectors.length; i++) {
this.connectors[i].initConnector();
}
}
this.visit = function(element)
{
if(element == this.htmlElement)
this.visit = function(element) {
if (element == this.htmlElement)
return true;
// check the element dimensions against the acutal size of the canvas
this.width = Math.max(this.width, calculateOffsetLeft(element) - this.offsetLeft + element.offsetWidth);
this.height = Math.max(this.height, calculateOffsetTop(element) - this.offsetTop + element.offsetHeight);
if(isBlock(element))
{
if(isBlock(element)) {
// block found initialize it
var newBlock = new Block(element, this);
newBlock.initBlock();
this.blocks.push(newBlock);
return false;
}
else if(isConnector(element))
{
} else if(isConnector(element)) {
// connector found, just create it, source or destination blocks may not
// have been initialized yet
var newConnector = new Connector(element, this);
this.connectors.push(newConnector);
return false;
}
else
{
} else {
// continue searching nested elements
return true;
}
@ -351,6 +343,28 @@ function Canvas(htmlElement) {
return output;
}
this.alignBlocks = function()
{
var i;
for (i = 0; i < this.blocks.length ; i++) {
var b = this.blocks[i]; //.findBlock(blockId);
b.onMove();
// TODO: alert ("align "+b);
}
for(i = 0; i < this.connectors.length; i++) {
this.connectors[i].repaint();
console.log( this.connectors[i]);
}
}
this.fitBlocks = function()
{
var i;
for (i = 0; i < this.blocks.length ; i++) {
var b = this.blocks[i]; //.findBlock(blockId);
this.blocks[i].fit ();
}
}
/*
* This function searches for a nested block with a given id
*/
@ -477,12 +491,31 @@ function Block(htmlElement, canvas)
return result;
}
this.fit = function()
{
function getlines(txt) {
return (12*txt.split ("\n").length);
}
function getcolumns(txt) {
var cols = 0;
var txts = txt.split ("\n");
for (var x in txts) {
const len = txts[x].length;
if (len>cols)
cols = len;
}
return 10+ (7*cols);
}
var text = this.htmlElement.innerHTML;
this.htmlElement.style.width = getcolumns (text);
this.htmlElement.style.height = getlines (text);
}
this.move = function(left, top)
{
this.htmlElement.style.left = left;
this.htmlElement.style.top = top;
this.onMove();
}
@ -536,46 +569,42 @@ function Segment(id, parentElement)
if(this.nextSegment)
{
this.nextSegment.startX = this.getEndX();
this.nextSegment.startY = this.getEndY();
this.nextSegment.startY = this.getEndY();
}
if(this.visible)
this.htmlElement.style.display = 'block';
else
this.htmlElement.style.display = 'none';
this.htmlElement.style.display = this.visible?'block':'none';
switch(this.orientation)
{
case LEFT:
this.htmlElement.style.left = (this.startX - this.length) + "px";
this.htmlElement.style.top = this.startY + "px";
switch (this.orientation) {
case LEFT:
this.htmlElement.style.left = (this.startX - this.length) + "px";
this.htmlElement.style.top = this.startY + "px";
this.htmlElement.style.width = this.length + "px";
this.htmlElement.style.height = this.thickness + "px";
break;
case RIGHT:
this.htmlElement.style.left = this.startX + "px";
this.htmlElement.style.top = this.startY + "px";
if(this.nextSegment)
this.htmlElement.style.width = this.length + this.thickness + "px";
else
this.htmlElement.style.width = this.length + "px";
this.htmlElement.style.height = this.thickness + "px";
break;
case RIGHT:
this.htmlElement.style.left = this.startX + "px";
this.htmlElement.style.top = this.startY + "px";
if(this.nextSegment)
this.htmlElement.style.width = this.length + this.thickness + "px";
else
this.htmlElement.style.width = this.length + "px";
this.htmlElement.style.height = this.thickness + "px";
break;
case UP:
this.htmlElement.style.left = this.startX + "px";
this.htmlElement.style.top = (this.startY - this.length) + "px";
this.htmlElement.style.width = this.thickness + "px";
this.htmlElement.style.height = this.thickness + "px";
break;
case UP:
this.htmlElement.style.left = this.startX + "px";
this.htmlElement.style.top = (this.startY - this.length) + "px";
this.htmlElement.style.width = this.thickness + "px";
this.htmlElement.style.height = this.length + "px";
break;
case DOWN:
this.htmlElement.style.left = this.startX + "px";
this.htmlElement.style.top = this.startY + "px";
this.htmlElement.style.width = this.thickness + "px";
if(this.nextSegment)
this.htmlElement.style.height = this.length + this.thickness + "px";
else
this.htmlElement.style.height = this.length + "px";
break;
case DOWN:
this.htmlElement.style.left = this.startX + "px";
this.htmlElement.style.top = this.startY + "px";
this.htmlElement.style.width = this.thickness + "px";
if(this.nextSegment)
this.htmlElement.style.height = this.length + this.thickness + "px";
else
this.htmlElement.style.height = this.length + "px";
break;
break;
}
if(this.nextSegment)
@ -599,14 +628,12 @@ function Segment(id, parentElement)
/**
* Returns the "top" coordinate of the end point of this segment
*/
this.getEndY = function()
{
switch(this.orientation)
{
case LEFT: return this.startY;
case RIGHT: return this.startY;
case DOWN: return this.startY + this.length;
case UP: return this.startY - this.length;
this.getEndY = function() {
switch (this.orientation) {
case LEFT: return this.startY;
case RIGHT: return this.startY;
case DOWN: return this.startY + this.length;
case UP: return this.startY - this.length;
}
}
@ -1166,6 +1193,8 @@ function initPageObjects()
var newCanvas = new Canvas(divs[i]);
newCanvas.initCanvas();
canvases.push(newCanvas);
newCanvas.fitBlocks();
newCanvas.alignBlocks();
}
}
}
@ -1176,7 +1205,6 @@ function initPageObjects()
* Utility functions
*/
function findCanvas(canvasId) {
for (var i = 0; i < canvases.length; i++)
if(canvases[i].id == canvasId)
@ -1709,8 +1737,9 @@ function VerticalCStrategy(connector, startOrientation)
}
strategies[0] = function(connector) {return new VerticalSStrategy(connector)};
strategies[1] = function(connector) {return new HorizontalSStrategy(connector)};
/*
strategies[0] = function(connector) {return new HorizontalSStrategy(connector)};
strategies[2] = function(connector) {return new HorizontalCStrategy(connector, LEFT)};
strategies[1] = function(connector) {return new VerticalSStrategy(connector)};
strategies[2] = function(connector) {return new HorizontalLStrategy(connector)};
strategies[3] = function(connector) {return new VerticalLStrategy(connector)};