lukechilds
/
ethminer
mirror of https://github.com/lukechilds/ethminer.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Coding style: use "o_" prefix for output function arguments

cl-refactor
Paweł Bylica 10 years ago
parent
aaaf5439fb
commit
8ee32d9197
4 changed files with 39 additions and 41 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 28
      libevmjit/Arith256.cpp
  2. 40
      libevmjit/Ext.cpp
  3. 4
      libevmjit/Memory.cpp
  4. 8
      libevmjit/Stack.cpp

28
libevmjit/Arith256.cpp
View File

@ -103,55 +103,55 @@ extern "C"
using namespace dev::eth::jit; using namespace dev::eth::jit;
EXPORT void arith_mul(i256* _arg1, i256* _arg2, i256* _result) EXPORT void arith_mul(i256* _arg1, i256* _arg2, i256* o_result)
{ {
dev::u256 arg1 = llvm2eth(*_arg1); dev::u256 arg1 = llvm2eth(*_arg1);
dev::u256 arg2 = llvm2eth(*_arg2); dev::u256 arg2 = llvm2eth(*_arg2);
*_result = eth2llvm(arg1 * arg2); *o_result = eth2llvm(arg1 * arg2);
} }
EXPORT void arith_div(i256* _arg1, i256* _arg2, i256* _result) EXPORT void arith_div(i256* _arg1, i256* _arg2, i256* o_result)
{ {
dev::u256 arg1 = llvm2eth(*_arg1); dev::u256 arg1 = llvm2eth(*_arg1);
dev::u256 arg2 = llvm2eth(*_arg2); dev::u256 arg2 = llvm2eth(*_arg2);
*_result = eth2llvm(arg2 == 0 ? arg2 : arg1 / arg2); *o_result = eth2llvm(arg2 == 0 ? arg2 : arg1 / arg2);
} }
EXPORT void arith_mod(i256* _arg1, i256* _arg2, i256* _result) EXPORT void arith_mod(i256* _arg1, i256* _arg2, i256* o_result)
{ {
dev::u256 arg1 = llvm2eth(*_arg1); dev::u256 arg1 = llvm2eth(*_arg1);
dev::u256 arg2 = llvm2eth(*_arg2); dev::u256 arg2 = llvm2eth(*_arg2);
*_result = eth2llvm(arg2 == 0 ? arg2 : arg1 % arg2); *o_result = eth2llvm(arg2 == 0 ? arg2 : arg1 % arg2);
} }
EXPORT void arith_sdiv(i256* _arg1, i256* _arg2, i256* _result) EXPORT void arith_sdiv(i256* _arg1, i256* _arg2, i256* o_result)
{ {
dev::u256 arg1 = llvm2eth(*_arg1); dev::u256 arg1 = llvm2eth(*_arg1);
dev::u256 arg2 = llvm2eth(*_arg2); dev::u256 arg2 = llvm2eth(*_arg2);
*_result = eth2llvm(arg2 == 0 ? arg2 : dev::s2u(dev::u2s(arg1) / dev::u2s(arg2))); *o_result = eth2llvm(arg2 == 0 ? arg2 : dev::s2u(dev::u2s(arg1) / dev::u2s(arg2)));
} }
EXPORT void arith_smod(i256* _arg1, i256* _arg2, i256* _result) EXPORT void arith_smod(i256* _arg1, i256* _arg2, i256* o_result)
{ {
dev::u256 arg1 = llvm2eth(*_arg1); dev::u256 arg1 = llvm2eth(*_arg1);
dev::u256 arg2 = llvm2eth(*_arg2); dev::u256 arg2 = llvm2eth(*_arg2);
*_result = eth2llvm(arg2 == 0 ? arg2 : dev::s2u(dev::u2s(arg1) % dev::u2s(arg2))); *o_result = eth2llvm(arg2 == 0 ? arg2 : dev::s2u(dev::u2s(arg1) % dev::u2s(arg2)));
} }
EXPORT void arith_mulmod(i256* _arg1, i256* _arg2, i256* _arg3, i256* _result) EXPORT void arith_mulmod(i256* _arg1, i256* _arg2, i256* _arg3, i256* o_result)
{ {
dev::u256 arg1 = llvm2eth(*_arg1); dev::u256 arg1 = llvm2eth(*_arg1);
dev::u256 arg2 = llvm2eth(*_arg2); dev::u256 arg2 = llvm2eth(*_arg2);
dev::u256 arg3 = llvm2eth(*_arg3); dev::u256 arg3 = llvm2eth(*_arg3);
*_result = eth2llvm(dev::u256((dev::bigint(arg1) * dev::bigint(arg2)) % arg3)); *o_result = eth2llvm(dev::u256((dev::bigint(arg1) * dev::bigint(arg2)) % arg3));
} }
EXPORT void arith_addmod(i256* _arg1, i256* _arg2, i256* _arg3, i256* _result) EXPORT void arith_addmod(i256* _arg1, i256* _arg2, i256* _arg3, i256* o_result)
{ {
dev::u256 arg1 = llvm2eth(*_arg1); dev::u256 arg1 = llvm2eth(*_arg1);
dev::u256 arg2 = llvm2eth(*_arg2); dev::u256 arg2 = llvm2eth(*_arg2);
dev::u256 arg3 = llvm2eth(*_arg3); dev::u256 arg3 = llvm2eth(*_arg3);
*_result = eth2llvm(dev::u256((dev::bigint(arg1) + dev::bigint(arg2)) % arg3)); *o_result = eth2llvm(dev::u256((dev::bigint(arg1) + dev::bigint(arg2)) % arg3));
} }
} }

40
libevmjit/Ext.cpp
View File

@ -168,11 +168,11 @@ extern "C"
using namespace dev::eth::jit; using namespace dev::eth::jit;
EXPORT void ext_store(Runtime* _rt, i256* _index, i256* _value) EXPORT void ext_store(Runtime* _rt, i256* _index, i256* o_value)
{ {
auto index = llvm2eth(*_index); auto index = llvm2eth(*_index);
auto value = _rt->getExt().store(index); // Interface uses native endianness auto value = _rt->getExt().store(index); // Interface uses native endianness
*_value = eth2llvm(value); *o_value = eth2llvm(value);
} }
EXPORT void ext_setStore(Runtime* _rt, i256* _index, i256* _value) EXPORT void ext_setStore(Runtime* _rt, i256* _index, i256* _value)
@ -187,28 +187,28 @@ extern "C"
ext.setStore(index, value); // Interface uses native endianness ext.setStore(index, value); // Interface uses native endianness
} }
EXPORT void ext_calldataload(Runtime* _rt, i256* _index, i256* _value) EXPORT void ext_calldataload(Runtime* _rt, i256* _index, i256* o_value)
{ {
auto index = static_cast<size_t>(llvm2eth(*_index)); auto index = static_cast<size_t>(llvm2eth(*_index));
assert(index + 31 > index); // TODO: Handle large index assert(index + 31 > index); // TODO: Handle large index
auto b = reinterpret_cast<byte*>(_value); auto b = reinterpret_cast<byte*>(o_value);
for (size_t i = index, j = 0; i <= index + 31; ++i, ++j) for (size_t i = index, j = 0; i <= index + 31; ++i, ++j)
b[j] = i < _rt->getExt().data.size() ? _rt->getExt().data[i] : 0; // Keep Big Endian b[j] = i < _rt->getExt().data.size() ? _rt->getExt().data[i] : 0; // Keep Big Endian
// TODO: It all can be done by adding padding to data or by using min() algorithm without branch // TODO: It all can be done by adding padding to data or by using min() algorithm without branch
} }
EXPORT void ext_balance(Runtime* _rt, h256* _address, i256* _value) EXPORT void ext_balance(Runtime* _rt, h256* _address, i256* o_value)
{ {
auto u = _rt->getExt().balance(right160(*_address)); auto u = _rt->getExt().balance(right160(*_address));
*_value = eth2llvm(u); *o_value = eth2llvm(u);
} }
EXPORT void ext_suicide(Runtime* _rt, h256* _address) EXPORT void ext_suicide(Runtime* _rt, h256 const* _address)
{ {
_rt->getExt().suicide(right160(*_address)); _rt->getExt().suicide(right160(*_address));
} }
EXPORT void ext_create(Runtime* _rt, i256* _endowment, i256* _initOff, i256* _initSize, h256* _address) EXPORT void ext_create(Runtime* _rt, i256* _endowment, i256* _initOff, i256* _initSize, h256* o_address)
{ {
auto&& ext = _rt->getExt(); auto&& ext = _rt->getExt();
auto endowment = llvm2eth(*_endowment); auto endowment = llvm2eth(*_endowment);
@ -222,21 +222,21 @@ extern "C"
auto&& initRef = bytesConstRef(_rt->getMemory().data() + initOff, initSize); auto&& initRef = bytesConstRef(_rt->getMemory().data() + initOff, initSize);
OnOpFunc onOp {}; // TODO: Handle that thing OnOpFunc onOp {}; // TODO: Handle that thing
h256 address(ext.create(endowment, &gas, initRef, onOp), h256::AlignRight); h256 address(ext.create(endowment, &gas, initRef, onOp), h256::AlignRight);
*_address = address; *o_address = address;
} }
else else
*_address = {}; *o_address = {};
} }
EXPORT void ext_call(Runtime* _rt, i256* _gas, h256* _receiveAddress, i256* _value, i256* _inOff, i256* _inSize, i256* _outOff, i256* _outSize, h256* _codeAddress, i256* _ret) EXPORT void ext_call(Runtime* _rt, i256* io_gas, h256* _receiveAddress, i256* _value, i256* _inOff, i256* _inSize, i256* _outOff, i256* _outSize, h256* _codeAddress, i256* o_ret)
{ {
auto&& ext = _rt->getExt(); auto&& ext = _rt->getExt();
auto value = llvm2eth(*_value); auto value = llvm2eth(*_value);
auto ret = false; auto ret = false;
auto gas = llvm2eth(*_gas); auto gas = llvm2eth(*io_gas);
if (ext.balance(ext.myAddress) >= value) if (ext.balance(ext.myAddress) >= value)
{ {
ext.subBalance(value); ext.subBalance(value);
@ -252,25 +252,25 @@ extern "C"
ret = ext.call(receiveAddress, value, inRef, &gas, outRef, onOp, {}, codeAddress); ret = ext.call(receiveAddress, value, inRef, &gas, outRef, onOp, {}, codeAddress);
} }
*_gas = eth2llvm(gas); *io_gas = eth2llvm(gas);
_ret->a = ret ? 1 : 0; o_ret->a = ret ? 1 : 0;
} }
EXPORT void ext_sha3(Runtime* _rt, i256* _inOff, i256* _inSize, i256* _ret) EXPORT void ext_sha3(Runtime* _rt, i256* _inOff, i256* _inSize, i256* o_ret)
{ {
auto inOff = static_cast<size_t>(llvm2eth(*_inOff)); auto inOff = static_cast<size_t>(llvm2eth(*_inOff));
auto inSize = static_cast<size_t>(llvm2eth(*_inSize)); auto inSize = static_cast<size_t>(llvm2eth(*_inSize));
auto dataRef = bytesConstRef(_rt->getMemory().data() + inOff, inSize); auto dataRef = bytesConstRef(_rt->getMemory().data() + inOff, inSize);
auto hash = sha3(dataRef); auto hash = sha3(dataRef);
*_ret = *reinterpret_cast<i256*>(&hash); *o_ret = *reinterpret_cast<i256*>(&hash);
} }
EXPORT void ext_exp(Runtime*, i256* _left, i256* _right, i256* _ret) EXPORT void ext_exp(Runtime*, i256* _left, i256* _right, i256* o_ret)
{ {
bigint left = llvm2eth(*_left); bigint left = llvm2eth(*_left);
bigint right = llvm2eth(*_right); bigint right = llvm2eth(*_right);
auto ret = static_cast<u256>(boost::multiprecision::powm(left, right, bigint(2) << 256)); auto ret = static_cast<u256>(boost::multiprecision::powm(left, right, bigint(2) << 256));
*_ret = eth2llvm(ret); *o_ret = eth2llvm(ret);
} }
EXPORT unsigned char* ext_codeAt(Runtime* _rt, h256* _addr256) EXPORT unsigned char* ext_codeAt(Runtime* _rt, h256* _addr256)
@ -281,12 +281,12 @@ extern "C"
return const_cast<unsigned char*>(code.data()); return const_cast<unsigned char*>(code.data());
} }
EXPORT void ext_codesizeAt(Runtime* _rt, h256* _addr256, i256* _ret) EXPORT void ext_codesizeAt(Runtime* _rt, h256* _addr256, i256* o_ret)
{ {
auto&& ext = _rt->getExt(); auto&& ext = _rt->getExt();
auto addr = right160(*_addr256); auto addr = right160(*_addr256);
auto& code = ext.codeAt(addr); auto& code = ext.codeAt(addr);
*_ret = eth2llvm(u256(code.size())); *o_ret = eth2llvm(u256(code.size()));
} }
} }

4
libevmjit/Memory.cpp
View File

@ -224,7 +224,6 @@ void Memory::dump(uint64_t _begin, uint64_t _end)
extern "C" extern "C"
{ {
using namespace dev::eth::jit; using namespace dev::eth::jit;
EXPORT uint8_t* mem_resize(Runtime* _rt, i256* _size) EXPORT uint8_t* mem_resize(Runtime* _rt, i256* _size)
@ -234,5 +233,4 @@ extern "C"
memory.resize(size); memory.resize(size);
return memory.data(); return memory.data();
} }
}
} // extern "C"

8
libevmjit/Stack.cpp
View File

@ -79,7 +79,7 @@ extern "C"
stack.erase(stack.end() - _count, stack.end()); stack.erase(stack.end() - _count, stack.end());
} }
EXPORT void stack_push(Runtime* _rt, i256* _word) EXPORT void stack_push(Runtime* _rt, i256 const* _word)
{ {
auto& stack = _rt->getStack(); auto& stack = _rt->getStack();
stack.push_back(*_word); stack.push_back(*_word);
@ -88,17 +88,17 @@ extern "C"
Stack::maxStackSize = stack.size(); Stack::maxStackSize = stack.size();
} }
EXPORT void stack_get(Runtime* _rt, uint64_t _index, i256* _ret) EXPORT void stack_get(Runtime* _rt, uint64_t _index, i256* o_ret)
{ {
auto& stack = _rt->getStack(); auto& stack = _rt->getStack();
// TODO: encode _index and stack size in the return code // TODO: encode _index and stack size in the return code
if (stack.size() <= _index) if (stack.size() <= _index)
longjmp(_rt->getJmpBuf(), static_cast<uint64_t>(ReturnCode::StackTooSmall)); longjmp(_rt->getJmpBuf(), static_cast<uint64_t>(ReturnCode::StackTooSmall));
*_ret = *(stack.rbegin() + _index); *o_ret = *(stack.rbegin() + _index);
} }
EXPORT void stack_set(Runtime* _rt, uint64_t _index, i256* _word) EXPORT void stack_set(Runtime* _rt, uint64_t _index, i256 const* _word)
{ {
auto& stack = _rt->getStack(); auto& stack = _rt->getStack();
// TODO: encode _index and stack size in the return code // TODO: encode _index and stack size in the return code

Write Preview
Loading…
Cancel
Save