[TEST:INSTRUCTION] Improve assembly code

Author: RatinCN

Source/Demo/Instruction.c

@@ -15,11 +15,11 @@ FN_INSTRUCTION(VOID);
 
 #if defined(_M_X64)
 
-EXTERN_C FN_INSTRUCTION* SimpleInstructionFunc1X64Ptr;
+EXTERN_C FN_INSTRUCTION SimpleInstructionFunc1X64;
 
 #elif defined(_M_IX86)
 
-EXTERN_C FN_INSTRUCTION* SimpleInstructionFunc1X86Ptr;
+EXTERN_C FN_INSTRUCTION SimpleInstructionFunc1X86;
 
 #endif
 
@@ -32,11 +32,11 @@ Hooked_InstructionFunc(VOID)
     return (ULONG_PTR)PRESET_RETURN_VALUE * 2;
 }
 
-static FN_INSTRUCTION** g_apfnInstructionFunctions[] = {
+static FN_INSTRUCTION* g_apfnInstructionFunctions[] = {
 #if defined(_M_X64)
-    &SimpleInstructionFunc1X64Ptr,
+    &SimpleInstructionFunc1X64,
 #elif defined(_M_IX86)
-    &SimpleInstructionFunc1X86Ptr,
+    &SimpleInstructionFunc1X86,
 #endif
     NULL
 };
@@ -48,7 +48,7 @@ TEST_FUNC(Instruction)
 
     for (ULONG i = 0; i < ARRAYSIZE(g_apfnInstructionFunctions) && g_apfnInstructionFunctions[i] != NULL; i++)
     {
-        pfn2 = pfn1 = *g_apfnInstructionFunctions[i];
+        pfn2 = pfn1 = g_apfnInstructionFunctions[i];
         if (pfn1() != (ULONG_PTR)PRESET_RETURN_VALUE)
         {
             TEST_SKIP("Instruction Function #%lu did not return the preset value\n", i);

Source/Demo/Instruction.inc

@@ -1,17 +1,8 @@
-IFDEF _M_IX86
+INCLUDE KNSoft\NDK\Assembly\Header.inc
+INCLUDE KNSoft\NDK\Assembly\NDK.inc
 
-SIZE_T equ <DWORD>
-PRESET_RETURN_VALUE equ 012345678h
-
-ELSE
-
-SIZE_T equ <QWORD>
+IFDEF _WIN64
 PRESET_RETURN_VALUE equ 01234567890ABCDEFh
-
+ELSE
+PRESET_RETURN_VALUE equ 012345678h
 ENDIF
-
-$PublicFuncAddr MACRO Func
-    align 4
-    @CatStr(Func, <Ptr SIZE_T offset >, Func)
-    PUBLIC @CatStr(Func, <Ptr>)
-ENDM

Source/Demo/Instruction.x64.asm

@@ -1,6 +1,6 @@
-include Instruction.inc
+INCLUDE Instruction.inc
 
-.code
+.CODE
 
 SimpleInstructionFunc1X64 PROC
 
@@ -10,8 +10,4 @@ SimpleInstructionFunc1X64 PROC
 
 SimpleInstructionFunc1X64 ENDP
 
-.const
-
-$PublicFuncAddr SimpleInstructionFunc1X64
-
 END

Source/Demo/Instruction.x86.asm

@@ -1,21 +1,13 @@
-.686P
-.XMM
-.model flat, stdcall
+INCLUDE Instruction.inc
 
-include Instruction.inc
+.CODE
 
-.code
-
-SimpleInstructionFunc1X86 PROC
+SimpleInstructionFunc1X86 PROC C
 
     xor     eax, eax
     mov     eax, PRESET_RETURN_VALUE
     ret
 
 SimpleInstructionFunc1X86 ENDP
 
-.const
-
-$PublicFuncAddr SimpleInstructionFunc1X86
-
 END