diff --git a/alethzero/MainWin.cpp b/alethzero/MainWin.cpp index 69335cc03..6873612a8 100644 --- a/alethzero/MainWin.cpp +++ b/alethzero/MainWin.cpp @@ -848,7 +848,7 @@ void Main::on_blocks_currentItemChanged() else { if (tx.data.size()) - s << eth::memDump(tx.data, 16); + s << eth::memDump(tx.data, 16, true); } } @@ -977,7 +977,7 @@ void Main::on_data_textChanged() else s = s.mid(1); } - ui->code->setHtml(QString::fromStdString(eth::memDump(m_data))); + ui->code->setHtml(QString::fromStdString(eth::memDump(m_data, 8, true))); if (m_client->postState().addressHasCode(fromString(ui->destination->currentText()))) { ui->gas->setMinimum((qint64)state().callGas(m_data.size(), 1)); @@ -1247,7 +1247,7 @@ void Main::updateDebugger() for (auto i: ws.stack) ds->insertItem(0, QString::fromStdString(toHex(((h256)i).asArray()))); - ui->debugMemory->setHtml(QString::fromStdString(eth::memDump(ws.memory, 16))); + ui->debugMemory->setHtml(QString::fromStdString(eth::memDump(ws.memory, 16, true))); ui->debugCode->setCurrentRow(m_pcWarp[(unsigned)ws.curPC]); ostringstream ss; ss << hex << "PC: 0x" << ws.curPC << " | GAS: 0x" << ws.gas; diff --git a/liblll/CompilerState.cpp b/liblll/CompilerState.cpp index 5cf2a965d..74e5062f7 100644 --- a/liblll/CompilerState.cpp +++ b/liblll/CompilerState.cpp @@ -41,6 +41,11 @@ void CompilerState::populateStandard() { static const string s = "{" "(def 'gav 0x8a40bfaa73256b60764c1bf40675a99083efb075)" + "(def 'namereg 0x2d0aceee7e5ab874e22ccf8d1a649f59106d74e8)" + "(def 'config 0xccdeac59d35627b7de09332e819d5159e7bb7250)" + "(def 'gavcoin 0x5620133321fcac7f15a5c570016f6cb6dc263f9d)" + "(def 'sendgavcoin (to value) { [0]:to [32]:value (call (- (gas) 21) gavcoin 0 0 64 0 0) })" + "(def 'regname (name) { [0]:name (call (- (gas) 21) namereg 0 0 32 0 0) })" "(def 'send (to value) (call (- (gas) 21) to value 0 0 0 0))" "(def 'send (gaslimit to value) (call gaslimit to value 0 0 0 0))" "(def 'alloc (len) (asm msize 0 1 len msize add sub mstore8))" @@ -53,6 +58,7 @@ void CompilerState::populateStandard() "(def 'create (code) { [0]:(msize) (create 0 @0 (lll code @0)) })" "(def 'sha3 (val) { [0]:val (sha3 0 32) })" "(def 'return (val) { [0]:val (return 0 32) })" + "(def 'returnlll (code) (return 0 (lll code 0)) )" "(def 'makeperm (name pos) { (def name (sload pos)) (def name (v) (sstore pos v)) } )" "(def 'permcount 0)" "(def 'perm (name) { (makeperm name permcount) (def 'permcount (+ permcount 1)) } )"