Browse Source

Avoid _asm from MSVC.

cl-refactor
Gav Wood 11 years ago
parent
commit
2ee1cda66e
  1. 2
      libethereum/Client.cpp
  2. 2
      liblll/Assembly.h
  3. 6
      stdserv.js

2
libethereum/Client.cpp

@ -410,7 +410,7 @@ void Client::work(bool _justQueue)
cwork << "BQ ==> CHAIN ==> STATE";
OverlayDB db = m_stateDB;
m_lock.unlock();
h256s newBlocks = m_bc.sync(m_bq, db, 100);
h256s newBlocks = m_bc.sync(m_bq, db, 100); // TODO: remove transactions from m_tq nicely rather than relying on out of date nonce later on.
if (newBlocks.size())
{
for (auto i: newBlocks)

2
liblll/Assembly.h

@ -80,7 +80,7 @@ public:
AssemblyItem const& append(AssemblyItem const& _i);
AssemblyItem const& append(std::string const& _data) { return append(newPushString(_data)); }
AssemblyItem const& append(bytes const& _data) { return append(newData(_data)); }
AssemblyItem appendSubSize(Assembly const& _asm) { auto ret = newSub(_asm); append(newPushSubSize(ret.data())); return ret; }
AssemblyItem appendSubSize(Assembly const& _asmbly) { auto ret = newSub(_asmbly); append(newPushSubSize(ret.data())); return ret; }
AssemblyItem appendJump() { auto ret = append(newPushTag()); append(Instruction::JUMP); return ret; }
AssemblyItem appendJumpI() { auto ret = append(newPushTag()); append(Instruction::JUMPI); return ret; }

6
stdserv.js

@ -140,8 +140,6 @@ eth.transact(eth.key, '0', config, "2".pad(32) + gavCoin.pad(32), 10000, eth.gas
var exchangeCode = eth.lll("
{
; init
[0] 'register
[32] 'Exchange
(msg allgas 0x50441127ea5b9dfd835a9aba4e1dc9c1257b58ca 0 0 64)
@ -206,7 +204,7 @@ var exchangeCode = eth.lll("
(for {} (&& @item (>= (rateof @item) @irate)) {} {
(set 'offerA (min @xoffer (wantof @item)))
(set 'wantA (/ (* @offerA (rateof @item)) (exp 2 128))) ; CHECK!
(set 'wantA (/ (* @offerA (rateof @item)) (exp 2 128)))
(set 'xoffer (- @xoffer @offerA))
(set 'xwant (- @xwant @wantA))
@ -263,7 +261,7 @@ env.note('Create Exchange...')
eth.create(eth.key, '0', exchangeCode, 10000, eth.gasPrice, function(a) { exchange = a; });
env.note('Register Exchange...')
eth.transact(eth.key, '0', config, "2".pad(32) + exchange.pad(32), 10000, eth.gasPrice);
eth.transact(eth.key, '0', config, "3".pad(32) + exchange.pad(32), 10000, eth.gasPrice);

Loading…
Cancel
Save