From fcde2f3d228999d31c2f2ca0e6f688e7176a4f28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Bylica?= <pawel.bylica@imapp.pl>
Date: Wed, 1 Oct 2014 12:44:45 +0200
Subject: [PATCH] Accessing Ext static data: CALLER, ORIGIN, CALLVALUE,
 CALLDATASIZE, GASPRICE

---
 evmcc/Compiler.cpp          | 35 +++++++++++++++++++++++++++++++++++
 evmcc/ExecutionEngine.cpp   |  6 ++++++
 evmcc/Ext.cpp               | 11 +++++++++--
 evmcc/Ext.h                 |  8 ++++++++
 evmcc/bytecode/ext_test.evm |  2 +-
 evmcc/lll/ext_test.lll      |  5 +++++
 6 files changed, 64 insertions(+), 3 deletions(-)

diff --git a/evmcc/Compiler.cpp b/evmcc/Compiler.cpp
index 0bbcafafb..77aaaa92f 100644
--- a/evmcc/Compiler.cpp
+++ b/evmcc/Compiler.cpp
@@ -270,6 +270,41 @@ std::unique_ptr<llvm::Module> Compiler::compile(const dev::bytes& bytecode)
 			break;
 		}
 
+		case Instruction::CALLER:
+		{
+			auto value = ext.caller();
+			stack.push(value);
+			break;
+		}
+
+		case Instruction::ORIGIN:
+		{
+			auto value = ext.origin();
+			stack.push(value);
+			break;
+		}
+
+		case Instruction::CALLVALUE:
+		{
+			auto value = ext.callvalue();
+			stack.push(value);
+			break;
+		}
+
+		case Instruction::CALLDATASIZE:
+		{
+			auto value = ext.calldatasize();
+			stack.push(value);
+			break;
+		}
+
+		case Instruction::GASPRICE:
+		{
+			auto value = ext.gasprice();
+			stack.push(value);
+			break;
+		}
+
 		}
 	}
 
diff --git a/evmcc/ExecutionEngine.cpp b/evmcc/ExecutionEngine.cpp
index 2b305e04a..9011ac694 100644
--- a/evmcc/ExecutionEngine.cpp
+++ b/evmcc/ExecutionEngine.cpp
@@ -70,6 +70,12 @@ int ExecutionEngine::run(std::unique_ptr<llvm::Module> _module)
 
 	auto ext = std::make_unique<dev::eth::ExtVMFace>();
 	ext->myAddress = dev::Address(1122334455667788);
+	ext->caller = dev::Address(0xfacefacefaceface);
+	ext->origin = dev::Address(101010101010101010);
+	ext->value = 0xabcd;
+	ext->gasPrice = 1002;
+	std::string calldata = "Hello World!";
+	ext->data = calldata;
 	Ext::init(std::move(ext));
 
 	auto entryFunc = module->getFunction("main");
diff --git a/evmcc/Ext.cpp b/evmcc/Ext.cpp
index c6658f80c..309ef21a3 100644
--- a/evmcc/Ext.cpp
+++ b/evmcc/Ext.cpp
@@ -87,12 +87,19 @@ void Ext::setStore(llvm::Value* _index, llvm::Value* _value)
 	m_builder.CreateCall(m_setStore, m_args);
 }
 
-Value* Ext::address()
+Value* Ext::getDataElem(unsigned _index, const Twine& _name)
 {
-	auto valuePtr = m_builder.CreateStructGEP(m_data, 0);
+	auto valuePtr = m_builder.CreateStructGEP(m_data, _index, _name);
 	return m_builder.CreateLoad(valuePtr);
 }
 
+Value* Ext::address() { return getDataElem(0, "address"); }
+Value* Ext::caller() { return getDataElem(1, "caller"); }
+Value* Ext::origin() { return getDataElem(2, "origin"); }
+Value* Ext::callvalue() { return getDataElem(3, "callvalue"); }
+Value* Ext::calldatasize() { return getDataElem(5, "calldatasize"); }
+Value* Ext::gasprice() { return getDataElem(4, "gasprice"); }
+
 extern "C"
 {
 
diff --git a/evmcc/Ext.h b/evmcc/Ext.h
index f1e6ccc66..60efe9f6f 100644
--- a/evmcc/Ext.h
+++ b/evmcc/Ext.h
@@ -20,6 +20,14 @@ public:
 	void setStore(llvm::Value* _index, llvm::Value* _value);
 
 	llvm::Value* address();
+	llvm::Value* caller();
+	llvm::Value* origin();
+	llvm::Value* callvalue();
+	llvm::Value* calldatasize();
+	llvm::Value* gasprice();
+
+private:
+	llvm::Value* getDataElem(unsigned _index, const llvm::Twine& _name = "");
 
 private:
 	llvm::IRBuilder<>& m_builder;
diff --git a/evmcc/bytecode/ext_test.evm b/evmcc/bytecode/ext_test.evm
index 64bb6b746..afbe4e752 100644
--- a/evmcc/bytecode/ext_test.evm
+++ b/evmcc/bytecode/ext_test.evm
@@ -1 +1 @@
-30
+30333234363a
diff --git a/evmcc/lll/ext_test.lll b/evmcc/lll/ext_test.lll
index 627f6f96e..27dceabde 100644
--- a/evmcc/lll/ext_test.lll
+++ b/evmcc/lll/ext_test.lll
@@ -1,4 +1,9 @@
 
 (asm 
 ADDRESS
+CALLER
+ORIGIN
+CALLVALUE
+CALLDATASIZE
+GASPRICE
 )
\ No newline at end of file