From 86b88d2e6b00615714fb8b2ba32bc21dfc8bcf33 Mon Sep 17 00:00:00 2001 From: Ende! Date: Mon, 16 Mar 2015 14:12:18 +0100 Subject: [PATCH] corrected some "static" declarations --- Bindings/C/VXInstructionDecoderC.c | 59 ++++++++++++++-------------- Bindings/C/VXInstructionFormatterC.c | 46 +++++++++++----------- Bindings/C/VXInternalHelpersC.h | 3 -- 3 files changed, 53 insertions(+), 55 deletions(-) diff --git a/Bindings/C/VXInstructionDecoderC.c b/Bindings/C/VXInstructionDecoderC.c index 7c6d862..3d44a4d 100644 --- a/Bindings/C/VXInstructionDecoderC.c +++ b/Bindings/C/VXInstructionDecoderC.c @@ -60,9 +60,8 @@ typedef struct _VXBaseDataSource VXBaseDataSource_SetPositionCallback setPosition; } VXBaseDataSource; -void VXBaseDataSource_Construct(VXBaseDataSourceContext *ctx); -void VXBaseDataSource_Destruct(VXBaseDataSourceContext *ctx); -void VXBaseDataSource_Release(VXBaseDataSourceContext *ctx); +static void VXBaseDataSource_Construct(VXBaseDataSourceContext *ctx); +static void VXBaseDataSource_Destruct(VXBaseDataSourceContext *ctx); uint8_t VXBaseDataSource_InputPeek(VXBaseDataSourceContext *ctx, VXInstructionInfo *info); uint8_t VXBaseDataSource_InputNext8(VXBaseDataSourceContext *ctx, VXInstructionInfo *info); uint16_t VXBaseDataSource_InputNext16(VXBaseDataSourceContext *ctx, VXInstructionInfo *info); @@ -80,14 +79,14 @@ typedef struct _VXMemoryDataSource uint64_t inputBufferPos; } VXMemoryDataSource; -void VXMemoryDataSource_Construct(VXBaseDataSourceContext *ctx, const void* buffer, size_t bufferLen); -void VXMemoryDataSource_Destruct(VXBaseDataSourceContext *ctx); +static void VXMemoryDataSource_Construct(VXBaseDataSourceContext *ctx, const void* buffer, size_t bufferLen); +static void VXMemoryDataSource_Destruct(VXBaseDataSourceContext *ctx); VXBaseDataSourceContext* VXMemoryDataSource_Create(const void* buffer, size_t bufferLen); -uint8_t VXMemoryDataSource_InternalInputPeek(VXBaseDataSourceContext *ctx); -uint8_t VXMemoryDataSource_InternalInputNext(VXBaseDataSourceContext *ctx); -bool VXMemoryDataSource_IsEndOfInput(const VXBaseDataSourceContext *ctx); -uint64_t VXMemoryDataSource_GetPosition(const VXBaseDataSourceContext *ctx); -bool VXMemoryDataSource_SetPosition(VXBaseDataSourceContext *ctx, uint64_t position); +static uint8_t VXMemoryDataSource_InternalInputPeek(VXBaseDataSourceContext *ctx); +static uint8_t VXMemoryDataSource_InternalInputNext(VXBaseDataSourceContext *ctx); +static bool VXMemoryDataSource_IsEndOfInput(const VXBaseDataSourceContext *ctx); +static uint64_t VXMemoryDataSource_GetPosition(const VXBaseDataSourceContext *ctx); +static bool VXMemoryDataSource_SetPosition(VXBaseDataSourceContext *ctx, uint64_t position); /* VXInstructionDecoder ------------------------------------------------------------------------ */ @@ -109,12 +108,12 @@ typedef enum _VXRegisterClass /* : uint8_t */ RC_XMM } VXRegisterClass; -uint8_t VXInstructionDecoder_InputPeek(VXInstructionDecoderContext *ctx, VXInstructionInfo *info); -uint8_t VXInstructionDecoder_InputNext8(VXInstructionDecoderContext *ctx, VXInstructionInfo *info); -uint16_t VXInstructionDecoder_InputNext16(VXInstructionDecoderContext *ctx, VXInstructionInfo *info); -uint32_t VXInstructionDecoder_InputNext32(VXInstructionDecoderContext *ctx, VXInstructionInfo *info); -uint64_t VXInstructionDecoder_InputNext64(VXInstructionDecoderContext *ctx, VXInstructionInfo *info); -uint8_t VXInstructionDecoder_InputCurrent(const VXInstructionDecoderContext *ctx); +static uint8_t VXInstructionDecoder_InputPeek(VXInstructionDecoderContext *ctx, VXInstructionInfo *info); +static uint8_t VXInstructionDecoder_InputNext8(VXInstructionDecoderContext *ctx, VXInstructionInfo *info); +static uint16_t VXInstructionDecoder_InputNext16(VXInstructionDecoderContext *ctx, VXInstructionInfo *info); +static uint32_t VXInstructionDecoder_InputNext32(VXInstructionDecoderContext *ctx, VXInstructionInfo *info); +static uint64_t VXInstructionDecoder_InputNext64(VXInstructionDecoderContext *ctx, VXInstructionInfo *info); +static uint8_t VXInstructionDecoder_InputCurrent(const VXInstructionDecoderContext *ctx); VXBaseDataSourceContext* VXInstructionDecoder_GetDataSource(const VXInstructionDecoderContext *ctx); void VXInstructionDecoder_SetDataSource(VXInstructionDecoderContext *ctx, VXBaseDataSourceContext *input); VXDisassemblerMode VXInstructionDecoder_GetDisassemblerMode(const VXInstructionDecoderContext *ctx); @@ -123,20 +122,20 @@ VXInstructionSetVendor VXInstructionDecoder_GetPreferredVendor(const VXInstructi void VXInstructionDecoder_SetPreferredVendor(VXInstructionDecoderContext *ctx, VXInstructionSetVendor preferredVendor); uint64_t VXInstructionDecoder_GetInstructionPointer(const VXInstructionDecoderContext *ctx); void VXInstructionDecoder_SetInstructionPointer(VXInstructionDecoderContext *ctx, uint64_t instructionPointer); -bool VXInstructionDecoder_DecodeRegisterOperand(const VXInstructionDecoderContext *ctx, VXInstructionInfo *info, VXOperandInfo *operand, VXRegisterClass registerClass, uint8_t registerId, VXDefinedOperandSize operandSize); -bool VXInstructionDecoder_DecodeRegisterMemoryOperand(VXInstructionDecoderContext *ctx, VXInstructionInfo *info, VXOperandInfo *operand, VXRegisterClass registerClass, VXDefinedOperandSize operandSize); -bool VXInstructionDecoder_DecodeImmediate(VXInstructionDecoderContext *ctx, VXInstructionInfo *info, VXOperandInfo *operand, VXDefinedOperandSize operandSize); -bool VXInstructionDecoder_DecodeDisplacement(VXInstructionDecoderContext *ctx, VXInstructionInfo *info, VXOperandInfo *operand, uint8_t size); -bool VXInstructionDecoder_DecodeModrm(VXInstructionDecoderContext *ctx, VXInstructionInfo *info); -bool VXInstructionDecoder_DecodeSIB(VXInstructionDecoderContext *ctx, VXInstructionInfo *info); -bool VXInstructionDecoder_DecodeVex(VXInstructionDecoderContext *ctx, VXInstructionInfo *info); -uint16_t VXInstructionDecoder_GetEffectiveOperandSize(const VXInstructionDecoderContext *ctx, const VXInstructionInfo *info, VXDefinedOperandSize operandSize); -bool VXInstructionDecoder_DecodeOperands(VXInstructionDecoderContext *ctx, VXInstructionInfo *info); -bool VXInstructionDecoder_DecodeOperand(VXInstructionDecoderContext *ctx, VXInstructionInfo *info, VXOperandInfo *operand, VXDefinedOperandType operandType, VXDefinedOperandSize operandSize); -void VXInstructionDecoder_ResolveOperandAndAddressMode(const VXInstructionDecoderContext *ctx, VXInstructionInfo *info); -void VXInstructionDecoder_CalculateEffectiveRexVexValues(const VXInstructionDecoderContext *ctx, VXInstructionInfo *info); -bool VXInstructionDecoder_DecodePrefixes(VXInstructionDecoderContext *ctx, VXInstructionInfo *info); -bool VXInstructionDecoder_DecodeOpcode(VXInstructionDecoderContext *ctx, VXInstructionInfo *info); +static bool VXInstructionDecoder_DecodeRegisterOperand(const VXInstructionDecoderContext *ctx, VXInstructionInfo *info, VXOperandInfo *operand, VXRegisterClass registerClass, uint8_t registerId, VXDefinedOperandSize operandSize); +static bool VXInstructionDecoder_DecodeRegisterMemoryOperand(VXInstructionDecoderContext *ctx, VXInstructionInfo *info, VXOperandInfo *operand, VXRegisterClass registerClass, VXDefinedOperandSize operandSize); +static bool VXInstructionDecoder_DecodeImmediate(VXInstructionDecoderContext *ctx, VXInstructionInfo *info, VXOperandInfo *operand, VXDefinedOperandSize operandSize); +static bool VXInstructionDecoder_DecodeDisplacement(VXInstructionDecoderContext *ctx, VXInstructionInfo *info, VXOperandInfo *operand, uint8_t size); +static bool VXInstructionDecoder_DecodeModrm(VXInstructionDecoderContext *ctx, VXInstructionInfo *info); +static bool VXInstructionDecoder_DecodeSIB(VXInstructionDecoderContext *ctx, VXInstructionInfo *info); +static bool VXInstructionDecoder_DecodeVex(VXInstructionDecoderContext *ctx, VXInstructionInfo *info); +static uint16_t VXInstructionDecoder_GetEffectiveOperandSize(const VXInstructionDecoderContext *ctx, const VXInstructionInfo *info, VXDefinedOperandSize operandSize); +static bool VXInstructionDecoder_DecodeOperands(VXInstructionDecoderContext *ctx, VXInstructionInfo *info); +static bool VXInstructionDecoder_DecodeOperand(VXInstructionDecoderContext *ctx, VXInstructionInfo *info, VXOperandInfo *operand, VXDefinedOperandType operandType, VXDefinedOperandSize operandSize); +static void VXInstructionDecoder_ResolveOperandAndAddressMode(const VXInstructionDecoderContext *ctx, VXInstructionInfo *info); +static void VXInstructionDecoder_CalculateEffectiveRexVexValues(const VXInstructionDecoderContext *ctx, VXInstructionInfo *info); +static bool VXInstructionDecoder_DecodePrefixes(VXInstructionDecoderContext *ctx, VXInstructionInfo *info); +static bool VXInstructionDecoder_DecodeOpcode(VXInstructionDecoderContext *ctx, VXInstructionInfo *info); VXInstructionDecoderContext* VXInstructionDecoder_Create(void); VXInstructionDecoderContext* VXInstructionDecoder_CreateEx(VXBaseDataSourceContext *input, VXDisassemblerMode disassemblerMode, VXInstructionSetVendor preferredVendor, uint64_t instructionPointer); bool VXInstructionDecoder_DecodeInstruction(VXInstructionDecoderContext *ctx, VXInstructionInfo *info); diff --git a/Bindings/C/VXInstructionFormatterC.c b/Bindings/C/VXInstructionFormatterC.c index cd81a15..9403aa6 100644 --- a/Bindings/C/VXInstructionFormatterC.c +++ b/Bindings/C/VXInstructionFormatterC.c @@ -59,8 +59,8 @@ typedef struct _VXBaseSymbolResolver VXBaseSymbolResolver_ResolveSymbolCallback resolveCallback; } VXBaseSymbolResolver; -void VXBaseSymbolResolver_Construct(VXBaseSymbolResolverContext *ctx); -void VXBaseSymbolResolver_Destruct(VXBaseSymbolResolverContext *ctx); +static void VXBaseSymbolResolver_Construct(VXBaseSymbolResolverContext *ctx); +static void VXBaseSymbolResolver_Destruct(VXBaseSymbolResolverContext *ctx); void VXBaseSymbolResolver_Release(VXBaseSymbolResolverContext *ctx); const char* VXBaseSymbolResolver_ResolveSymbol(VXBaseSymbolResolverContext *ctx, const VXInstructionInfo *info, uint64_t address, uint64_t *offset); @@ -82,22 +82,22 @@ typedef struct _VXBaseInstructionFormatter bool outputUppercase; } VXBaseInstructionFormatter; -void VXBaseInstructionFormatter_Construct(VXBaseInstructionFormatterContext *ctx, VXBaseSymbolResolverContext *symbolResolver); -void VXBaseInstructionFormatter_Destruct(VXBaseInstructionFormatterContext *ctx); +static void VXBaseInstructionFormatter_Construct(VXBaseInstructionFormatterContext *ctx, VXBaseSymbolResolverContext *symbolResolver); +static void VXBaseInstructionFormatter_Destruct(VXBaseInstructionFormatterContext *ctx); void VXBaseInstructionFormatter_Release(VXBaseInstructionFormatterContext *ctx); -void VXBaseInstructionFormatter_OutputSetUppercase(VXBaseInstructionFormatterContext *ctx, bool uppercase); -char const* VXBaseInstructionFormatter_RegisterToString(const VXBaseInstructionFormatterContext *ctx, VXRegister reg); -char const* VXBaseInstructionFormatter_ResolveSymbol(const VXBaseInstructionFormatterContext *ctx, const VXInstructionInfo *info, uint64_t address, uint64_t *offset); +static void VXBaseInstructionFormatter_OutputSetUppercase(VXBaseInstructionFormatterContext *ctx, bool uppercase); +static char const* VXBaseInstructionFormatter_RegisterToString(const VXBaseInstructionFormatterContext *ctx, VXRegister reg); +static char const* VXBaseInstructionFormatter_ResolveSymbol(const VXBaseInstructionFormatterContext *ctx, const VXInstructionInfo *info, uint64_t address, uint64_t *offset); VXBaseSymbolResolverContext* VXBaseInstructionFormatter_GetSymbolResolver(const VXBaseInstructionFormatterContext *ctx); void VXBaseInstructionFormatter_SetSymbolResolver(VXBaseInstructionFormatterContext *ctx, VXBaseSymbolResolverContext *symbolResolver); const char* VXBaseInstructionFormatter_FormatInstruction(VXBaseInstructionFormatterContext *ctx, const VXInstructionInfo *info); -void VXBaseInstructionFormatter_OutputClear(VXBaseInstructionFormatterContext *ctx); -char const* VXBaseInstructionFormatter_OutputString(VXBaseInstructionFormatterContext *ctx); -void VXBaseInstructionFormatter_OutputAppend(VXBaseInstructionFormatterContext *ctx, char const *text); -void VXBaseInstructionFormatter_OutputAppendFormatted(VXBaseInstructionFormatterContext *ctx, char const *format, ...); -void VXBaseInstructionFormatter_OutputAppendAddress(VXBaseInstructionFormatterContext *ctx, const VXInstructionInfo *info, uint64_t address, bool resolveSymbols); -void VXBaseInstructionFormatter_OutputAppendImmediate(VXBaseInstructionFormatterContext *ctx, const VXInstructionInfo *info, const VXOperandInfo *operand, bool resolveSymbols); -void VXBaseInstructionFormatter_OutputAppendDisplacement(VXBaseInstructionFormatterContext *ctx, const VXInstructionInfo *info, const VXOperandInfo *operand); +static void VXBaseInstructionFormatter_OutputClear(VXBaseInstructionFormatterContext *ctx); +static char const* VXBaseInstructionFormatter_OutputString(VXBaseInstructionFormatterContext *ctx); +static void VXBaseInstructionFormatter_OutputAppend(VXBaseInstructionFormatterContext *ctx, char const *text); +static void VXBaseInstructionFormatter_OutputAppendFormatted(VXBaseInstructionFormatterContext *ctx, char const *format, ...); +static void VXBaseInstructionFormatter_OutputAppendAddress(VXBaseInstructionFormatterContext *ctx, const VXInstructionInfo *info, uint64_t address, bool resolveSymbols); +static void VXBaseInstructionFormatter_OutputAppendImmediate(VXBaseInstructionFormatterContext *ctx, const VXInstructionInfo *info, const VXOperandInfo *operand, bool resolveSymbols); +static void VXBaseInstructionFormatter_OutputAppendDisplacement(VXBaseInstructionFormatterContext *ctx, const VXInstructionInfo *info, const VXOperandInfo *operand); /* VXCustomSymbolResolver ---------------------------------------------------------------------- */ @@ -108,10 +108,10 @@ typedef struct _VXCustomSymbolResolver void *userData; } VXCustomSymbolResolver; -void VXCustomSymbolResolver_Construct(VXBaseSymbolResolverContext *ctx, VXCustomSymbolResolver_ResolveSymbolCallback resolverCb, void *userData); -void VXCustomSymbolResolver_Destruct(VXBaseSymbolResolverContext *ctx); +static void VXCustomSymbolResolver_Construct(VXBaseSymbolResolverContext *ctx, VXCustomSymbolResolver_ResolveSymbolCallback resolverCb, void *userData); +static void VXCustomSymbolResolver_Destruct(VXBaseSymbolResolverContext *ctx); VXBaseSymbolResolverContext* VXCustomSymbolResolver_Create(VXCustomSymbolResolver_ResolveSymbolCallback resolverCb, void *userData); -const char* VXCustomSymbolResolver_Resolve(VXBaseSymbolResolverContext *ctx, const VXInstructionInfo *info, uint64_t address, uint64_t *offset); +static const char* VXCustomSymbolResolver_Resolve(VXBaseSymbolResolverContext *ctx, const VXInstructionInfo *info, uint64_t address, uint64_t *offset); /* VXIntelInstructionFormatter ----------------------------------------------------------------- */ @@ -120,11 +120,13 @@ typedef struct _VXIntelInstructionFormatter VXBaseInstructionFormatter super; } VXIntelInstructionFormatter; -void VXIntelInstructionFormatter_Construct(VXBaseInstructionFormatterContext *ctx, VXBaseSymbolResolverContext *symbolResolver); -void VXIntelInstructionFormatter_Destruct(VXBaseInstructionFormatterContext *ctx); -void VXIntelInstructionFormatter_OutputAppendOperandCast(VXBaseInstructionFormatterContext *ctx, const VXInstructionInfo *info, const VXOperandInfo *operand); -void VXIntelInstructionFormatter_FormatOperand(VXBaseInstructionFormatterContext *ctx, const VXInstructionInfo *info, const VXOperandInfo *operand); -void VXIntelInstructionFormatter_InternalFormatInstruction(VXBaseInstructionFormatterContext *ctx, const VXInstructionInfo *info); +VXBaseInstructionFormatterContext* VXIntelInstructionFormatter_Create(void); +VXBaseInstructionFormatterContext* VXIntelInstructionFormatter_CreateEx(VXBaseSymbolResolverContext *resolver); +static void VXIntelInstructionFormatter_Construct(VXBaseInstructionFormatterContext *ctx, VXBaseSymbolResolverContext *symbolResolver); +static void VXIntelInstructionFormatter_Destruct(VXBaseInstructionFormatterContext *ctx); +static void VXIntelInstructionFormatter_OutputAppendOperandCast(VXBaseInstructionFormatterContext *ctx, const VXInstructionInfo *info, const VXOperandInfo *operand); +static void VXIntelInstructionFormatter_FormatOperand(VXBaseInstructionFormatterContext *ctx, const VXInstructionInfo *info, const VXOperandInfo *operand); +static void VXIntelInstructionFormatter_InternalFormatInstruction(VXBaseInstructionFormatterContext *ctx, const VXInstructionInfo *info); /* Implementation ============================================================================== */ diff --git a/Bindings/C/VXInternalHelpersC.h b/Bindings/C/VXInternalHelpersC.h index 2ea5ca7..0c63be2 100644 --- a/Bindings/C/VXInternalHelpersC.h +++ b/Bindings/C/VXInternalHelpersC.h @@ -39,9 +39,6 @@ #include -struct _VXBaseDataSource; -struct _VXInstructionDecoder; - /* Types IDs =================================================================================== */ typedef enum _VXTypeId