Virtualization
/
capstone
mirror of https://gitlab.com/qemu-project/capstone.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed MSVC warnings

This commit is contained in:
Daniel Collin 2015-10-05 16:31:06 +02:00
parent 498c097717
commit 25d2ea6ac6
3 changed files with 26 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
arch/M68K/M68KDisassembler.c
View File

@ -2677,51 +2677,51 @@ static void d68000_moveq(m68k_info *info)
static void d68040_move16_pi_pi(m68k_info *info)
{
LIMIT_CPU_TYPES(info, M68040_PLUS);
int data[] = { info->ir & 7, (read_imm_16(info) >> 12) & 7 }; // FIXME: declare this at the beginning of this function
int data[] = { info->ir & 7, (read_imm_16(info) >> 12) & 7 };
int modes[] = { M68K_AM_REGI_ADDR_POST_INC, M68K_AM_REGI_ADDR_POST_INC };
LIMIT_CPU_TYPES(info, M68040_PLUS);
build_move16(info, data, modes);
}
static void d68040_move16_pi_al(m68k_info *info)
{
LIMIT_CPU_TYPES(info, M68040_PLUS);
int data[] = { info->ir & 7, read_imm_32(info) };
int modes[] = { M68K_AM_REGI_ADDR_POST_INC, M68K_AM_ABSOLUTE_DATA_LONG };
LIMIT_CPU_TYPES(info, M68040_PLUS);
build_move16(info, data, modes);
}
static void d68040_move16_al_pi(m68k_info *info)
{
LIMIT_CPU_TYPES(info, M68040_PLUS);
int data[] = { read_imm_32(info), info->ir & 7 };
int modes[] = { M68K_AM_ABSOLUTE_DATA_LONG, M68K_AM_REGI_ADDR_POST_INC };
LIMIT_CPU_TYPES(info, M68040_PLUS);
build_move16(info, data, modes);
}
static void d68040_move16_ai_al(m68k_info *info)
{
LIMIT_CPU_TYPES(info, M68040_PLUS);
int data[] = { info->ir & 7, read_imm_32(info) };
int modes[] = { M68K_AM_REG_DIRECT_ADDR, M68K_AM_ABSOLUTE_DATA_LONG };
LIMIT_CPU_TYPES(info, M68040_PLUS);
build_move16(info, data, modes);
}
static void d68040_move16_al_ai(m68k_info *info)
{
LIMIT_CPU_TYPES(info, M68040_PLUS);
int data[] = { read_imm_32(info), info->ir & 7 };
int modes[] = { M68K_AM_ABSOLUTE_DATA_LONG, M68K_AM_REG_DIRECT_ADDR };
LIMIT_CPU_TYPES(info, M68040_PLUS);
build_move16(info, data, modes);
}
@ -3857,7 +3857,7 @@ static unsigned int m68k_disassemble(m68k_info *info, uint64_t pc)
g_instruction_table[info->ir].instruction(info);
}
return info->pc - pc;
return info->pc - (unsigned int)pc;
}
bool M68K_getInstruction(csh ud, const uint8_t* code, size_t code_len, MCInst* instr, uint16_t* size, uint64_t address, void* inst_info)
@ -3895,7 +3895,7 @@ bool M68K_getInstruction(csh ud, const uint8_t* code, size_t code_len, MCInst* i
if (handle->mode & CS_MODE_M68K_060)
cpu_type = M68K_CPU_TYPE_68040; // 060 = 040 for now
m68k_setup_internals(info, instr, address, cpu_type);
m68k_setup_internals(info, instr, (unsigned int)address, cpu_type);
s = m68k_disassemble(info, address);
if (s == 0) {
@ -3909,7 +3909,7 @@ bool M68K_getInstruction(csh ud, const uint8_t* code, size_t code_len, MCInst* i
#endif
// Make sure we always stay within range
if (s > code_len)
if (s > (int)code_len)
*size = code_len;
else
*size = (uint16_t)s;

8
arch/M68K/M68KDisassembler.h
View File

@ -189,10 +189,10 @@ unsigned int m68k_read_pcrelative_16(m68k_info *info, uint64_t address);
unsigned int m68k_read_pcrelative_32(m68k_info *info, uint64_t address);
/* Memory access for the disassembler */
unsigned int m68k_read_disassembler_8 (m68k_info *info, uint64_t address);
unsigned int m68k_read_disassembler_16 (m68k_info *info, uint64_t address);
unsigned int m68k_read_disassembler_32 (m68k_info *info, uint64_t address);
uint64_t m68k_read_disassembler_64 (m68k_info *info, uint64_t address);
unsigned int m68k_read_disassembler_8 (m68k_info *info, const uint64_t address);
unsigned int m68k_read_disassembler_16 (m68k_info *info, const uint64_t address);
unsigned int m68k_read_disassembler_32 (m68k_info *info, const uint64_t address);
uint64_t m68k_read_disassembler_64 (m68k_info *info, const uint64_t address);
/* Write to anywhere */
void m68k_write_memory_8(m68k_info *info, unsigned int address, unsigned int value);

9
arch/M68K/M68KInstPrinter.c
View File

@ -1,6 +1,13 @@
/* Capstone Disassembly Engine */
/* M68K Backend by Daniel Collin <daniel@collin.com> 2015 */
#ifdef _MSC_VER
// Disable security warnings for strcat & sprintf
#ifndef _CRT_SECURE_NO_WARNINGS
#define _CRT_SECURE_NO_WARNINGS
#endif
#endif
#include <stdio.h> // DEBUG
#include <stdlib.h>
#include <string.h>
@ -92,7 +99,7 @@ static void printRegbitsRange(char* buffer, uint32_t data, const char* prefix)
static void registerBits(SStream* O, const cs_m68k_op* op)
{
char buffer[128] = { };
char buffer[128];
unsigned int data = op->register_bits;
buffer[0] = 0;