xcache
/
xcache
1
0
Fork 0
Code Releases Activity
Browse Source

decompiler: fix decompiling runtime array 

git-svn-id: svn://svn.lighttpd.net/xcache/trunk@737 c26eb9a1-5813-0410-bd6c-c2e55f420ca7
3.0
Xuefer 11 years ago
parent
8d18908346
commit
6e4375d61b
3 changed files with 81 additions and 32 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 100
      Decompiler.class.php
  2. 9
      decompilesample.php
  3. 4
      processor/head.m4

100
Decompiler.class.php
Unescape View File

@ -8,6 +8,18 @@ function color($str, $color = 33)
return "\x1B[{$color}m$str\x1B[0m";
}
function str($code, $indent = '') // {{{
{
if (is_object($code)) {
if (get_class($code) != 'Decompiler_Code') {
$code = toCode($code, $indent);
}
return $code->__toString();
}
return (string) $code;
}
// }}}
function toCode($src, $indent = '') // {{{
{
if (is_array($indent)) {
@ -19,10 +31,10 @@ function toCode($src, $indent = '') // {{{
var_dump($src);
exit('no toCode');
}
return $src->toCode($indent);
return new Decompiler_Code($src->toCode($indent));
}
return $src;
return new Decompiler_Code($src);
}
// }}}
function value($value) // {{{
@ -36,11 +48,11 @@ function value($value) // {{{
}
}
if ($value instanceof Decompiler_Object) {
if (is_a($value, 'Decompiler_Object')) {
// use as is
}
else if (is_array($value)) {
$value = new Decompiler_Array($value);
$value = new Decompiler_ConstArray($value);
}
else {
$value = new Decompiler_Value($value);
@ -77,6 +89,11 @@ class Decompiler_Code extends Decompiler_Object // {{{
}
function toCode($indent)
{
return $this;
}
function __toString()
{
return $this->src;
}
@ -242,43 +259,55 @@ class Decompiler_ListBox extends Decompiler_Box // {{{
// }}}
class Decompiler_Array extends Decompiler_Value // {{{
{
function Decompiler_Array($value = array())
// emenets
function Decompiler_Array()
{
$this->value = $value;
$this->value = array();
}
function toCode($indent)
{
$subindent = $indent . INDENT;
$elementsCode = array();
$index = 0;
foreach ($this->value as $element) {
list($key, $value) = $element;
if (!isset($key)) {
$key = $index++;
}
$elementsCode[] = array(str($key, $subindent), str($value, $subindent), $key, $value);
}
$exp = "array(";
$indent = $indent . INDENT;
$assocWidth = 0;
$multiline = 0;
$i = 0;
foreach ($this->value as $k => $v) {
if ($i !== $k) {
foreach ($elementsCode as $element) {
list($keyCode, $valueCode) = $element;
if ((string) $i !== $keyCode) {
$assocWidth = 1;
break;
}
++$i;
}
foreach ($this->value as $k => $v) {
foreach ($elementsCode as $element) {
list($keyCode, $valueCode, $key, $value) = $element;
if ($assocWidth) {
$len = strlen($k);
$len = strlen($keyCode);
if ($assocWidth < $len) {
$assocWidth = $len;
}
}
$spec = xcache_get_special_value($v);
if (is_array(isset($spec) ? $spec : $v)) {
if (is_array($value) || is_a($value, 'Decompiler_Array')) {
$multiline ++;
}
}
if ($assocWidth) {
$assocWidth += 2;
}
$i = 0;
$subindent = $indent . INDENT;
foreach ($this->value as $k => $v) {
foreach ($elementsCode as $element) {
list($keyCode, $value) = $element;
if ($multiline) {
if ($i) {
$exp .= ",";
@ -292,17 +321,16 @@ class Decompiler_Array extends Decompiler_Value // {{{
}
}
$k = var_export($k, true);
if ($assocWidth) {
if ($multiline) {
$exp .= sprintf("%{$assocWidth}s => ", $k);
$exp .= sprintf("%-{$assocWidth}s => ", $keyCode);
}
else {
$exp .= $k . ' => ';
$exp .= $keyCode . ' => ';
}
}
$exp .= toCode(value($v), $subindent);
$exp .= $value;
$i ++;
}
@ -316,6 +344,18 @@ class Decompiler_Array extends Decompiler_Value // {{{
}
}
// }}}
class Decompiler_ConstArray extends Decompiler_Array // {{{
{
function Decompiler_ConstArray($array)
{
$elements = array();
foreach ($array as $key => $value) {
$elements[] = array(value($key), value($value));
}
$this->value = $elements;
}
}
// }}}
class Decompiler_ForeachBox extends Decompiler_Box // {{{
{
var $iskey;
@ -1238,12 +1278,12 @@ class Decompiler
$rvalue = $this->getOpVal($op1, $EX, false, true);
if ($opc == XC_ADD_ARRAY_ELEMENT) {
$offset = $this->getOpVal($op2, $EX);
if (isset($offset)) {
$T[$res['var']]->value[$offset] = $rvalue;
$assoc = $this->getOpVal($op2, $EX);
if (isset($assoc)) {
$T[$res['var']]->value[] = array($assoc, $rvalue);
}
else {
$T[$res['var']]->value[] = $rvalue;
$T[$res['var']]->value[] = array(null, $rvalue);
}
}
else {
@ -1254,12 +1294,12 @@ class Decompiler
}
}
$offset = $this->getOpVal($op2, $EX);
if (isset($offset)) {
$resvar->value[$offset] = $rvalue;
$assoc = $this->getOpVal($op2, $EX);
if (isset($assoc)) {
$resvar->value[] = array($assoc, $rvalue);
}
else {
$resvar->value[] = $rvalue;
$resvar->value[] = array(null, $rvalue);
}
}
break;
@ -1372,7 +1412,7 @@ class Decompiler
else {
$default = null;
}
$EX['recvs'][$offset] = array($lvalue, $default);
$EX['recvs'][str($offset)] = array($lvalue, $default);
break;
case XC_POST_DEC:
case XC_POST_INC:

9
decompilesample.php
Unescape View File

@ -45,6 +45,15 @@ class ClassName
array('array')
))
{
$runtimeArray = array('1');
$runtimeArray2 = array(
'1',
array()
);
$runtimeArray3 = array(
'a' => '1',
2 => array()
);
return 'protected';
}

4
processor/head.m4
Unescape View File

@ -140,7 +140,7 @@ IFASSERT(`
#undef C_RELAYLINE
#define C_RELAYLINE , __LINE__
')
static inline void xc_calc_string_n(xc_processor_t *processor, zend_uchar type, const zstr str, long size IFASSERT(`, int relayline')) {
static inline void xc_calc_string_n(xc_processor_t *processor, zend_uchar type, const zstr const str, long size IFASSERT(`, int relayline')) {
pushdef(`__LINE__', `relayline')
int realsize = UNISW(size, (type == IS_UNICODE) ? UBYTES(size) : size);
long dummy = 1;
@ -162,7 +162,7 @@ static inline void xc_calc_string_n(xc_processor_t *processor, zend_uchar type,
/* }}} */
/* {{{ xc_store_string_n */
REDEF(`KIND', `store')
static inline zstr xc_store_string_n(xc_processor_t *processor, zend_uchar type, const zstr str, long size IFASSERT(`, int relayline')) {
static inline zstr xc_store_string_n(xc_processor_t *processor, zend_uchar type, const zstr const str, long size IFASSERT(`, int relayline')) {
pushdef(`__LINE__', `relayline')
int realsize = UNISW(size, (type == IS_UNICODE) ? UBYTES(size) : size);
zstr ret, *pret;

Write Preview
Loading…
Cancel
Save