[Rule] Add alloc() for DynArrUtils

second-state · Nov 20, 2018 · 466fe76 · 466fe76
1 parent 508cbb7
commit 466fe76
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 9 deletions.
diff --git a/libsolidity/codegen/ContractCompiler.cpp b/libsolidity/codegen/ContractCompiler.cpp
@@ -399,8 +399,8 @@ void ContractCompiler::appendRules(ContractDefinition const& _contract)
 	// rule init
 	for(auto rule: _contract.rules())
 	{
-		m_context << 32*3;
-		CompilerUtils(m_context).allocateMemory();
+		DynArrUtils(m_context, 1).alloc();
+		// lock_on_active listMaddr
 		m_context << keccak256(rule->name()+"-lockOnActive-list") << Instruction::SSTORE;
 	}
 

diff --git a/libsolidity/codegen/DynArrUtils.cpp b/libsolidity/codegen/DynArrUtils.cpp
@@ -95,6 +95,14 @@ void DynArrUtils::popItem()
 	m_context << Instruction::POP;
 }
 
+// Stack pre :
+// Stack post:
+void DynArrUtils::alloc()
+{
+	m_context << 32*3;
+	utils().allocateMemory();
+}
+
 // Stack pre : reference cap'(#elmts)
 // Stack post:
 void DynArrUtils::reAlloc()

diff --git a/libsolidity/codegen/DynArrUtils.h b/libsolidity/codegen/DynArrUtils.h
@@ -51,7 +51,9 @@ class DynArrUtils
 	/// Stack post: len
 	void getLen() { m_context << 32 << Instruction::ADD << Instruction::MLOAD; }
 
-	/// reallocate memory space and copy data to the new space
+	/// allocate memory space for array slice, which cost 32*3 bytes
+	void alloc();
+	/// reallocate data memory space and copy data to the new space
 	/// Stack pre : refer cap'
 	/// Stack post:
 	void reAlloc();

diff --git a/libsolidity/codegen/RuleEngineCompiler.cpp b/libsolidity/codegen/RuleEngineCompiler.cpp
@@ -110,8 +110,8 @@ void RuleEngineCompiler::compile(TypeNode const& _node)
 	auto inListAddr = keccak256(_node.type()->richIdentifier()+"-factlist");
 	// listPtr(to memList) in storage
 	auto outListPtrAddr = _node.outAddr();
-	m_context << 32*3;
-	utils().allocateMemory();
+
+	DynArrUtils(m_context, 1).alloc();
 	m_context << outListPtrAddr << Instruction::SSTORE;
 
 	eth::AssemblyItem loopStart = m_context.newTag();
@@ -157,8 +157,7 @@ void RuleEngineCompiler::compile(AlphaNode const& _node)
 	auto inListPtrAddr  = _node.parent()->outAddr();
 	auto outListPtrAddr = _node.outAddr();
 
-	m_context << 32*3;
-	utils().allocateMemory();
+	DynArrUtils(m_context, 1).alloc();
 	m_context << outListPtrAddr << Instruction::SSTORE;
 
 	m_context << inListPtrAddr << Instruction::SLOAD;
@@ -213,8 +212,7 @@ void RuleEngineCompiler::compile(JoinNode const& _node)
 		JoinNode const& left = *_node.leftParent();
 		AlphaNode const& right = *_node.rightParent();
 
-		m_context << 32*3;
-		utils().allocateMemory();
+		DynArrUtils(m_context, 1).alloc();
 		m_context << _node.outAddr() << Instruction::SSTORE;
 
 		m_context << right.outAddr() << Instruction::SLOAD;