Skip to content
This repository has been archived by the owner on Aug 2, 2022. It is now read-only.

Fix wasm_interface bug and other assorted changes #31

Merged
merged 2 commits into from
Jun 20, 2017
Merged

Fix wasm_interface bug and other assorted changes #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
875f782
Address Apple LLVM compile requirements, and get eosd using net_plugin
Jun 17, 2017
7159ee6
replace memcpy function to avoid compilation error. Some trailing whi…
Jun 18, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ else( WIN32 ) # Apple AND Linux
if( APPLE )
# Apple Specific Options Here
message( STATUS "Configuring Eos on OS X" )
set( CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} -Wall -Wno-deprecated-declarations" )
set( CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} -std=c++14 -Wall -Wno-invalid-partial-specialization -Wno-deprecated-declarations" )
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

-std=c++14 shouldn't go here; that's already being set on line 11 in this file. Is it not taking?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is not. I have verified that at this point CMAKE_CXX_STANDARD is indeed 14, but if I don't add the explicit --std=c++14, no joy comes to compile town.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Odd. What version of cmake?

else( APPLE )
# Linux Specific Options Here
message( STATUS "Configuring Eos on Linux" )
Expand Down
26 changes: 13 additions & 13 deletions libraries/chain/wasm_interface.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
namespace eos { namespace chain {
using namespace IR;
using namespace Runtime;

wasm_interface::wasm_interface() {
}

Expand Down Expand Up @@ -41,7 +41,7 @@ DEFINE_INTRINSIC_FUNCTION4(env,store,store,none,i32,keyptr,i32,keylen,i32,valuep
if( obj ) {
db.modify( *obj, [&]( auto& o ) {
o.value.resize( valuelen );
memcpy( o.value.data(), value, valuelen );
o.value.replace (0, valuelen, value);
});
} else {
db.create<key_value_object>( [&](auto& o) {
Expand All @@ -50,7 +50,7 @@ DEFINE_INTRINSIC_FUNCTION4(env,store,store,none,i32,keyptr,i32,keylen,i32,valuep
o.value.insert( 0, value, valuelen );
});
}
}
}

DEFINE_INTRINSIC_FUNCTION2(env,remove,remove,i32,i32,keyptr,i32,keylen) {
FC_ASSERT( keylen > 0 );
Expand Down Expand Up @@ -172,13 +172,13 @@ DEFINE_INTRINSIC_FUNCTION2(env,assert,assert,none,i32,test,i32,msg) {
std::string message = &Runtime::memoryRef<char>( wasm_interface::get().current_memory, msg );
if( !test ) edump((message));
FC_ASSERT( test, "assertion failed: ${s}", ("s",message)("ptr",msg) );
}
}

DEFINE_INTRINSIC_FUNCTION0(env,messageSize,messageSize,i32) {
return wasm_interface::get().current_validate_context->msg.data.size();
}

DEFINE_INTRINSIC_FUNCTION1(env,malloc,malloc,i32,i32,size) {
DEFINE_INTRINSIC_FUNCTION1(env,malloc,malloc,i32,i32,size) {
FC_ASSERT( size > 0 );
int32_t& end = Runtime::memoryRef<int32_t>( Runtime::getDefaultMemory(wasm_interface::get().current_module), 0);
int32_t old_end = end;
Expand All @@ -202,10 +202,10 @@ DEFINE_INTRINSIC_FUNCTION2(env,print,print,none,i32,charptr,i32,size) {
wlog( std::string( str, size ) );
}

DEFINE_INTRINSIC_FUNCTION1(env,free,free,none,i32,ptr) {
DEFINE_INTRINSIC_FUNCTION1(env,free,free,none,i32,ptr) {
}

DEFINE_INTRINSIC_FUNCTION1(env,toUpper,toUpper,none,i32,charptr) {
DEFINE_INTRINSIC_FUNCTION1(env,toUpper,toUpper,none,i32,charptr) {
std::cerr << "TO UPPER CALLED\n";// << charptr << "\n";
// std::cerr << "moduleInstance: " << moduleInstance << "\n";
// /*U8* base = */Runtime::getMemoryBaseAddress( Runtime::getDefaultMemory(moduleInstance) );
Expand All @@ -219,7 +219,7 @@ DEFINE_INTRINSIC_FUNCTION1(env,toUpper,toUpper,none,i32,charptr) {

wasm_interface& wasm_interface::get() {
static wasm_interface* wasm = nullptr;
if( !wasm )
if( !wasm )
{
wlog( "Runtime::init" );
Runtime::init();
Expand Down Expand Up @@ -273,7 +273,7 @@ DEFINE_INTRINSIC_FUNCTION1(env,toUpper,toUpper,none,i32,charptr) {
return U32(ptr - &memoryRef<char>(current_memory,0));
}

void wasm_interface::vm_apply()
void wasm_interface::vm_apply()
{ try {
try {
std::string mangledapply("onApply_");
Expand All @@ -297,7 +297,7 @@ DEFINE_INTRINSIC_FUNCTION1(env,toUpper,toUpper,none,i32,charptr) {
}
} FC_CAPTURE_AND_RETHROW() }

void wasm_interface::vm_onInit()
void wasm_interface::vm_onInit()
{ try {
try {
wlog( "onInit" );
Expand Down Expand Up @@ -375,7 +375,7 @@ DEFINE_INTRINSIC_FUNCTION1(env,toUpper,toUpper,none,i32,charptr) {
state.init_memory.resize(1<<16); /// TODO: actually get memory size
memcpy( state.init_memory.data(), memstart, state.init_memory.size() );
std::cerr <<"INIT MEMORY: \n";
for( uint32_t i = 0; i < 10000; ++i )
for( uint32_t i = 0; i < 10000; ++i )
if( memstart[i] )
std::cerr << (char)memstart[i];
std::cerr <<"\n";
Expand Down Expand Up @@ -415,15 +415,15 @@ DEFINE_INTRINSIC_FUNCTION1(env,toUpper,toUpper,none,i32,charptr) {
if( module ) {
char* memstart = &memoryRef<char>( current_memory, 0 );
memcpy( memstart, memory_backup.data(), memory_backup.size() );
return;
return;
auto start = fc::time_point::now();

RootResolver rootResolver;
LinkResult linkResult = linkModule(*module,rootResolver);
current_module = instantiateModule( *module, std::move(linkResult.resolvedImports) );
FC_ASSERT( current_module );
current_memory = Runtime::getDefaultMemory(current_module);


auto end = fc::time_point::now();
idump(( 1000000.0 / (end-start).count() ) );
Expand Down
5 changes: 3 additions & 2 deletions programs/eosd/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

#include <eos/producer_plugin/producer_plugin.hpp>
#include <eos/chain_api_plugin/chain_api_plugin.hpp>
#include <eos/net_plugin/net_plugin.hpp>

#include <fc/log/logger_config.hpp>
#include <fc/exception/exception.hpp>
Expand All @@ -14,10 +15,10 @@ using namespace eos;
int main(int argc, char** argv)
{
try {
app().register_plugin<net_plugin>();
app().register_plugin<chain_api_plugin>();
app().register_plugin<producer_plugin>();

if(!app().initialize<chain_plugin>(argc, argv))
if(!app().initialize<net_plugin, chain_plugin>(argc, argv))
return -1;

app().startup();
Expand Down