@@ -51,15 +51,12 @@ This is an Alpha version. Please report any bugs or suggestions.
 1. Initial support for Windows x64
 2. Initial support for Linux (x86 and x64) shellcodes
 
-# Keystone compilation
+# Keystone
 
 1. Download Keystone Engine source code
-2. Download, install and put in PATH cmake and python
-3. Open Visual Studio 2019 - x86 (for 32 bits) and x64 (for 64 bits) "Native Tools Command Prompts" and go to Keystone source directory
-4. Edit nmake-lib.bat file and replace -DLLVM_TARGETS_TO_BUILD="all" with -DLLVM_TARGETS_TO_BUILD="X86"
-5. Run mkdir build and cd build commands
-6. Run ..\nmake-lib.bat command
-7. Copy the resulted lib file from keystone-src\build\llvm\lib\keystone.lib to ShellcodeCompiler\Keystone\keystone_x86.lib (for 32 bits) and keystone_x64.lib (for 64 bits)
+2. Compile Keystone Engine as static library using nmake-lib.sh (for Linux) and nmake-lib.bat (for Windows)
+3. Windows: Copy the resulted lib file from keystone-src\build\llvm\lib\keystone.lib to ShellcodeCompiler\Keystone\keystone_x86.lib (for 32 bits) and keystone_x64.lib (for 64 bits)
+4. Linux: Copy the resulted lib file from keystone-src\build\llvm\lib\keystone.lib to ShellcodeCompiler\Keystone\libkeystone_x86.a (for 32 bits) and libkeystone_x64.a (for 64 bits)
 
 # Author
 
 
@@ -38,11 +38,11 @@ string ASMHeader::GetASMHeader_x86()
 		"inc ecx                                ; Increment the ordinal         \r\n"
 		"lodsd                                  ; Get name offset               \r\n"
 		"add eax, ebx                           ; Get function name             \r\n"
-		"cmp dword ptr [eax], 0x50746547        ; GetP                          \r\n"
+		"cmp dword [eax], 0x50746547            ; GetP                          \r\n"
 		"jnz Get_Function                                                       \r\n"
-		"cmp dword ptr [eax + 0x4], 0x41636f72  ; rocA                          \r\n"
+		"cmp dword [eax + 0x4], 0x41636f72      ; rocA                          \r\n"
 		"jnz Get_Function                                                       \r\n"
-		"cmp dword ptr [eax + 0x8], 0x65726464  ; ddre                          \r\n"
+		"cmp dword [eax + 0x8], 0x65726464      ; ddre                          \r\n"
 		"jnz Get_Function                                                       \r\n"
 		"mov esi, [edx + 0x24]                  ; ESI = Offset ordinals         \r\n"
 		"add esi, ebx                           ; ESI = Ordinals table          \r\n"
 
@@ -65,7 +65,7 @@ void CommandLine::PrintHelp(string p_sFile)
 	cout << "\tkill(1661, 9);" << endl;
 	cout << "\tgetpid();" << endl;
 	cout << "\texecve(\"/usr/bin/burpsuite\", 0, 0);" << endl;
-	cout << "\texit(2" << endl << endl;
+	cout << "\texit(2);" << endl << endl;
 
 	cout << "Invocation example" << endl;
 	cout << "------------------" << endl << endl;
 
@@ -77,7 +77,7 @@ string DeclaredFunctions::GenerateLoadLibraryCall_x86(string p_sDLLName)
 		sContent += Utils::CharToHexString(p_sDLLName[Len - 3]);
 		sContent += "\r\n";
 		sContent += "push eax\r\n";
-		sContent += "sub dword ptr [esp + 3], 0x23\r\n";
+		sContent += "sub dword [esp + 3], 0x23\r\n";
 	}
 	else cout << "Imaginary number?" << endl;
 
@@ -157,7 +157,7 @@ string DeclaredFunctions::GenerateLoadLibraryCall_x64(string p_sDLLName)
 		sContent += Utils::CharToHexString(p_sDLLName[Len - 3]);
 		sContent += "\r\n";
 		sContent += "push rax\r\n";
-		sContent += "sub dword ptr [rsp + 7], 0x23\r\n";
+		sContent += "sub dword [rsp + 7], 0x23\r\n";
 	}
 	else if (Len % 8 == 4)
 	{
@@ -303,7 +303,7 @@ string DeclaredFunctions::GenerateGetProcAddressCall_x86(string p_sDLLName, stri
 		sContent += Utils::CharToHexString(p_sFunctionName[Len - 3]);
 		sContent += "\r\n";
 		sContent += "push eax\r\n";
-		sContent += "sub dword ptr [esp + 3], 0x23\r\n";
+		sContent += "sub dword [esp + 3], 0x23\r\n";
 	}
 	else cout << "Imaginary number?" << endl;
 
@@ -323,7 +323,7 @@ string DeclaredFunctions::GenerateGetProcAddressCall_x86(string p_sDLLName, stri
 	// DLL base address
 
 	sContent += "push esp                               ; String on the stack            \r\n";
-	sContent += "push dword ptr [esp + ";
+	sContent += "push dword [esp + ";
 	sContent += to_string((NrFunctionsToStack * 4) + ((NrBasesToStack + 3 - DLLBaseAddress::GetDLLBase(p_sDLLName)) * 4) + ((Times + 2) * 4));
 	sContent += "] \r\n";
 
 
@@ -92,7 +92,7 @@ string FunctionCalls::GeneratePutStringToStack_x86(string p_sString)
 		sContent += Utils::CharToHexString(p_sString[Len - 3]);
 		sContent += "\r\n";
 		sContent += "push eax\r\n";
-		sContent += "sub dword ptr [esp + 3], 0x23\r\n";
+		sContent += "sub dword [esp + 3], 0x23\r\n";
 	}
 	else cout << "Imaginary number?" << endl;
 
@@ -265,7 +265,7 @@ string FunctionCalls::GenerateFunctionCall_x86(FunctionCalls::FunctionCall p_oFu
 	{
 		if (p_oFunctionCall.Parameters[i].Type == FunctionCalls::PARAMETER_TYPE_STRING)
 		{
-			sContent += "push dword ptr [ESP + ";
+			sContent += "push dword [ESP + ";
 			sContent += to_string(((CurrentParamNr - 1) * 4) + ((StringOffsetAddress::CurrentStringOffset - StringOffsetAddress::GetStringOffset(p_oFunctionCall.Parameters[i].StringValue)) * 4));
 			sContent += "]\r\n";
 		}
 
@@ -24,6 +24,8 @@ unsigned char* KeystoneLib::Assemble(size_t *p_pSize, string p_sASM)
 
 	// Assemble the code
 
+	ks_option(ks, KS_OPT_SYNTAX, KS_OPT_SYNTAX_NASM);
+
 	if (ks_asm(ks, p_sASM.c_str(), 0, &encode, &size, &count)) {
 		cout << "ERROR: Failed on ks_asm() with count = " << count << ", error code = " <<  ks_errno(ks) << endl;
 		return NULL;
Original file line number	Diff line number	Diff line change
@@ -92,7 +92,7 @@ string FunctionCalls::GeneratePutStringToStack_x86(string p_sString)
92	92	sContent += Utils::CharToHexString(p_sString[Len - 3]);
93	93	sContent += "\r\n";
94	94	sContent += "push eax\r\n";
95		- sContent += "sub dword ptr [esp + 3], 0x23\r\n";
	95	+ sContent += "sub dword [esp + 3], 0x23\r\n";
96	96	}
97	97	else cout << "Imaginary number?" << endl;
98	98
@@ -265,7 +265,7 @@ string FunctionCalls::GenerateFunctionCall_x86(FunctionCalls::FunctionCall p_oFu
265	265	{
266	266	if (p_oFunctionCall.Parameters[i].Type == FunctionCalls::PARAMETER_TYPE_STRING)
267	267	{
268		- sContent += "push dword ptr [ESP + ";
	268	+ sContent += "push dword [ESP + ";
269	269	sContent += to_string(((CurrentParamNr - 1) * 4) + ((StringOffsetAddress::CurrentStringOffset - StringOffsetAddress::GetStringOffset(p_oFunctionCall.Parameters[i].StringValue)) * 4));
270	270	sContent += "]\r\n";
271	271	}