From 7d20c400608202ad6303aaab75d94972ed55e7e2 Mon Sep 17 00:00:00 2001 From: Marius Melzer Date: Tue, 22 Jan 2019 01:39:44 +0100 Subject: [PATCH] Fix missing-prototypes warnings (#1348) --- MCInst.h | 2 ++ arch/AArch64/AArch64Disassembler.c | 2 ++ arch/M68K/M68KDisassembler.c | 2 +- arch/M68K/M68KInstPrinter.c | 6 ++++-- arch/M68K/M68KInstPrinter.h | 2 -- arch/Mips/MipsDisassembler.c | 3 ++- arch/Mips/MipsDisassembler.h | 1 + arch/PowerPC/PPCDisassembler.c | 2 ++ arch/Sparc/SparcDisassembler.c | 2 ++ arch/SystemZ/SystemZDisassembler.c | 2 ++ arch/TMS320C64x/TMS320C64xDisassembler.c | 2 ++ arch/X86/X86IntelInstPrinter.c | 1 + arch/XCore/XCoreDisassembler.c | 2 ++ 13 files changed, 23 insertions(+), 6 deletions(-) diff --git a/MCInst.h b/MCInst.h index 6e95c3a7a..9ecd14b9b 100644 --- a/MCInst.h +++ b/MCInst.h @@ -43,6 +43,8 @@ struct MCOperand { }; }; +void MCOperand_Init(MCOperand *op); + bool MCOperand_isValid(const MCOperand *op); bool MCOperand_isReg(const MCOperand *op); diff --git a/arch/AArch64/AArch64Disassembler.c b/arch/AArch64/AArch64Disassembler.c index 3b6030d5a..2ce96fa90 100644 --- a/arch/AArch64/AArch64Disassembler.c +++ b/arch/AArch64/AArch64Disassembler.c @@ -24,6 +24,8 @@ #include "../../cs_priv.h" #include "../../utils.h" +#include "AArch64Disassembler.h" + #include "../../MCInst.h" #include "../../MCInstrDesc.h" #include "../../MCFixedLenDisassembler.h" diff --git a/arch/M68K/M68KDisassembler.c b/arch/M68K/M68KDisassembler.c index 4ff84b88d..4f5eb940e 100644 --- a/arch/M68K/M68KDisassembler.c +++ b/arch/M68K/M68KDisassembler.c @@ -418,7 +418,7 @@ static void get_with_index_address_mode(m68k_info *info, cs_m68k_op* op, uint in } /* Make string of effective address mode */ -void get_ea_mode_op(m68k_info *info, cs_m68k_op* op, uint instruction, uint size) +static void get_ea_mode_op(m68k_info *info, cs_m68k_op* op, uint instruction, uint size) { // default to memory diff --git a/arch/M68K/M68KInstPrinter.c b/arch/M68K/M68KInstPrinter.c index a7d1e7de0..4efcdea6b 100644 --- a/arch/M68K/M68KInstPrinter.c +++ b/arch/M68K/M68KInstPrinter.c @@ -16,6 +16,8 @@ #include #include +#include "M68KInstPrinter.h" + #include "M68KDisassembler.h" #include "../../cs_priv.h" @@ -70,7 +72,7 @@ static const char* s_instruction_names[] = { #ifndef CAPSTONE_DIET -const char* getRegName(m68k_reg reg) +static const char* getRegName(m68k_reg reg) { return s_reg_names[(int)reg]; } @@ -126,7 +128,7 @@ static void registerPair(SStream* O, const cs_m68k_op* op) s_reg_names[M68K_REG_D0 + op->reg_pair.reg_1]); } -void printAddressingMode(SStream* O, unsigned int pc, const cs_m68k* inst, const cs_m68k_op* op) +static void printAddressingMode(SStream* O, unsigned int pc, const cs_m68k* inst, const cs_m68k_op* op) { switch (op->address_mode) { case M68K_AM_NONE: diff --git a/arch/M68K/M68KInstPrinter.h b/arch/M68K/M68KInstPrinter.h index d5f1e9bc9..45841ed2d 100644 --- a/arch/M68K/M68KInstPrinter.h +++ b/arch/M68K/M68KInstPrinter.h @@ -11,7 +11,6 @@ struct SStream; void M68K_init(MCRegisterInfo *MRI); - void M68K_printInst(MCInst* MI, struct SStream* O, void* Info); const char* M68K_reg_name(csh handle, unsigned int reg); void M68K_get_insn_id(cs_struct* h, cs_insn* insn, unsigned int id); @@ -20,4 +19,3 @@ const char* M68K_group_name(csh handle, unsigned int id); void M68K_post_printer(csh handle, cs_insn* flat_insn, char* insn_asm, MCInst* mci); #endif - diff --git a/arch/Mips/MipsDisassembler.c b/arch/Mips/MipsDisassembler.c index 7f1211e64..294082394 100644 --- a/arch/Mips/MipsDisassembler.c +++ b/arch/Mips/MipsDisassembler.c @@ -21,9 +21,10 @@ #include "capstone/platform.h" +#include "MipsDisassembler.h" + #include "../../utils.h" -#include "../../MCInst.h" #include "../../MCRegisterInfo.h" #include "../../SStream.h" diff --git a/arch/Mips/MipsDisassembler.h b/arch/Mips/MipsDisassembler.h index c1a2e894e..961c5f1ae 100644 --- a/arch/Mips/MipsDisassembler.h +++ b/arch/Mips/MipsDisassembler.h @@ -5,6 +5,7 @@ #define CS_MIPSDISASSEMBLER_H #include "capstone/capstone.h" +#include "../../MCInst.h" #include "../../MCRegisterInfo.h" void Mips_init(MCRegisterInfo *MRI); diff --git a/arch/PowerPC/PPCDisassembler.c b/arch/PowerPC/PPCDisassembler.c index bdb302bab..22b1ec42c 100644 --- a/arch/PowerPC/PPCDisassembler.c +++ b/arch/PowerPC/PPCDisassembler.c @@ -19,6 +19,8 @@ #include "../../cs_priv.h" #include "../../utils.h" +#include "PPCDisassembler.h" + #include "../../MCInst.h" #include "../../MCInstrDesc.h" #include "../../MCFixedLenDisassembler.h" diff --git a/arch/Sparc/SparcDisassembler.c b/arch/Sparc/SparcDisassembler.c index a230534c8..3e6d0e0b9 100644 --- a/arch/Sparc/SparcDisassembler.c +++ b/arch/Sparc/SparcDisassembler.c @@ -19,6 +19,8 @@ #include "../../cs_priv.h" #include "../../utils.h" +#include "SparcDisassembler.h" + #include "../../MCInst.h" #include "../../MCInstrDesc.h" #include "../../MCFixedLenDisassembler.h" diff --git a/arch/SystemZ/SystemZDisassembler.c b/arch/SystemZ/SystemZDisassembler.c index 5486154d3..9a1f611dd 100644 --- a/arch/SystemZ/SystemZDisassembler.c +++ b/arch/SystemZ/SystemZDisassembler.c @@ -19,6 +19,8 @@ #include "../../cs_priv.h" #include "../../utils.h" +#include "SystemZDisassembler.h" + #include "../../MCInst.h" #include "../../MCInstrDesc.h" #include "../../MCFixedLenDisassembler.h" diff --git a/arch/TMS320C64x/TMS320C64xDisassembler.c b/arch/TMS320C64x/TMS320C64xDisassembler.c index 52d74f48b..c20adf352 100644 --- a/arch/TMS320C64x/TMS320C64xDisassembler.c +++ b/arch/TMS320C64x/TMS320C64xDisassembler.c @@ -8,6 +8,8 @@ #include "../../cs_priv.h" #include "../../utils.h" +#include "TMS320C64xDisassembler.h" + #include "../../MCInst.h" #include "../../MCInstrDesc.h" #include "../../MCFixedLenDisassembler.h" diff --git a/arch/X86/X86IntelInstPrinter.c b/arch/X86/X86IntelInstPrinter.c index a78d5127b..1e266c1ae 100644 --- a/arch/X86/X86IntelInstPrinter.c +++ b/arch/X86/X86IntelInstPrinter.c @@ -41,6 +41,7 @@ #include "../../SStream.h" #include "../../MCRegisterInfo.h" +#include "X86InstPrinter.h" #include "X86Mapping.h" #define GET_INSTRINFO_ENUM diff --git a/arch/XCore/XCoreDisassembler.c b/arch/XCore/XCoreDisassembler.c index e661d3513..c095240a5 100644 --- a/arch/XCore/XCoreDisassembler.c +++ b/arch/XCore/XCoreDisassembler.c @@ -19,6 +19,8 @@ #include "../../cs_priv.h" #include "../../utils.h" +#include "XCoreDisassembler.h" + #include "../../MCInst.h" #include "../../MCInstrDesc.h" #include "../../MCFixedLenDisassembler.h"