Add expression function evaluation, and endianness() function to retr…

…ieve endianness of current platform

Archs/Architecture.cpp

@@ -14,6 +14,7 @@ ArchitectureCommand::ArchitectureCommand(const std::wstring& tempText, const std
 bool ArchitectureCommand::Validate()
 {
 	position = g_fileManager->getVirtualAddress();
+	g_fileManager->setEndianness(endianness);
 	return false;
 }
 

CMakeLists.txt

@@ -34,6 +34,8 @@ add_executable(armips
 	Core/Common.h
 	Core/Expression.cpp
 	Core/Expression.h
+	Core/ExpressionFunctions.cpp
+	Core/ExpressionFunctions.h
 	Core/FileManager.cpp
 	Core/FileManager.h
 	Core/Misc.cpp

Core/Expression.cpp

@@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "Expression.h"
 #include "Common.h"
+#include "ExpressionFunctions.h"
 
 enum class ExpressionValueCombination
 {
@@ -513,6 +514,50 @@ void ExpressionInternal::replaceMemoryPos(const std::wstring& identifierName)
 	}
 }
 
+ExpressionValue ExpressionInternal::executeFunctionCall()
+{
+	ExpressionValue invalid;
+
+	// find function, check parameter counts
+	auto it = expressionFunctions.find(strValue);
+	if (it == expressionFunctions.end())
+	{
+		Logger::queueError(Logger::Error,L"Unknown function \"%s\"",strValue);
+		return invalid;
+	}
+
+	if (it->second.minParams > childrenCount)
+	{
+		Logger::queueError(Logger::Error,L"Not enough parameters for \"%s\" (min %d)",strValue,it->second.minParams);
+		return invalid;
+	}
+
+	if (it->second.maxParams < childrenCount)
+	{
+		Logger::queueError(Logger::Error,L"Too many parameters for \"%s\" (min %d)",strValue,it->second.maxParams);
+		return invalid;
+	}
+
+	// evaluate parameters
+	std::vector<ExpressionValue> params;
+	params.reserve(childrenCount);
+
+	for (size_t i = 0; i < childrenCount; i++)
+	{
+		ExpressionValue result = children[i]->evaluate();
+		if (result.isValid() == false)
+		{
+			Logger::queueError(Logger::Error,L"Invalid expression");
+			return result;
+		}
+
+		params.push_back(result);
+	}
+
+	// execute
+	return it->second.function(params);
+}
+
 ExpressionValue ExpressionInternal::evaluate()
 {
 	ExpressionValue val;
@@ -620,6 +665,8 @@ ExpressionValue ExpressionInternal::evaluate()
 			return children[2]->evaluate();
 		else
 			return children[1]->evaluate();
+	case OperatorType::FunctionCall:
+		return executeFunctionCall();
 	default:
 		return val;
 	}

Core/Expression.h

@@ -128,6 +128,7 @@ class ExpressionInternal
 	void allocate(size_t count);
 	void deallocate();
 	std::wstring formatFunctionCall();
+	ExpressionValue executeFunctionCall();
 
 	OperatorType type;
 	ExpressionInternal** children;

Core/ExpressionFunctions.cpp

@@ -0,0 +1,28 @@
+#include "stdafx.h"
+#include "ExpressionFunctions.h"
+#include "Misc.h"
+#include "Common.h"
+
+ExpressionValue expressionFunctionEndianness(const std::vector<ExpressionValue>& parameters)
+{
+	Endianness endianness = g_fileManager->getEndianness();
+
+	ExpressionValue result;
+	result.type = ExpressionValueType::String;
+
+	switch (endianness)
+	{
+	case Endianness::Little:
+		result.strValue = L"little";
+		break;
+	case Endianness::Big:
+		result.strValue = L"big";
+		break;
+	}
+
+	return result;
+}
+
+const ExpressionFunctionMap expressionFunctions = {
+	{ L"endianness",	{ &expressionFunctionEndianness,	0,	0 } },
+};

Core/ExpressionFunctions.h

@@ -0,0 +1,15 @@
+#pragma once
+#include "Expression.h"
+#include <map>
+
+typedef ExpressionValue (*ExpressionFunction)(const std::vector<ExpressionValue>&);
+
+struct ExpressionFunctionEntry {
+	ExpressionFunction function;
+	size_t minParams;
+	size_t maxParams;
+};
+
+typedef std::map<std::wstring, const ExpressionFunctionEntry> ExpressionFunctionMap;
+
+extern const ExpressionFunctionMap expressionFunctions;

Core/FileManager.h

@@ -77,6 +77,7 @@ class FileManager
 	bool advanceMemory(size_t bytes);
 	AssemblerFile* getOpenFile() { return activeFile; };
 	void setEndianness(Endianness endianness) { this->endianness = endianness; };
+	Endianness getEndianness() { return endianness; }
 private:
 	bool checkActiveFile();
 	std::vector<AssemblerFile*> files;

libarmips.vcxproj

@@ -244,6 +244,7 @@
     <ClCompile Include="Core\ELF\ElfFile.cpp" />
     <ClCompile Include="Core\ELF\ElfRelocator.cpp" />
     <ClCompile Include="Core\Expression.cpp" />
+    <ClCompile Include="Core\ExpressionFunctions.cpp" />
     <ClCompile Include="Core\FileManager.cpp" />
     <ClCompile Include="Core\Misc.cpp" />
     <ClCompile Include="Core\SymbolData.cpp" />
@@ -297,6 +298,7 @@
     <ClInclude Include="Core\ELF\ElfRelocator.h" />
     <ClInclude Include="Core\ELF\ElfTypes.h" />
     <ClInclude Include="Core\Expression.h" />
+    <ClInclude Include="Core\ExpressionFunctions.h" />
     <ClInclude Include="Core\FileManager.h" />
     <ClInclude Include="Core\Misc.h" />
     <ClInclude Include="Core\SymbolData.h" />

libarmips.vcxproj.filters

@@ -160,6 +160,9 @@
     <ClCompile Include="Archs\MIPS\MipsParser.cpp">
       <Filter>Archs\MIPS</Filter>
     </ClCompile>
+    <ClCompile Include="Core\ExpressionFunctions.cpp">
+      <Filter>Core</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="Archs\Architecture.h">
@@ -295,5 +298,8 @@
     <ClInclude Include="Archs\MIPS\MipsParser.h">
       <Filter>Archs\MIPS</Filter>
     </ClInclude>
+    <ClInclude Include="Core\ExpressionFunctions.h">
+      <Filter>Core</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>