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

Merge branch 'next' of github.com:aquynh/capstone into next

This commit is contained in:
Nguyen Anh Quynh 2019-03-01 01:12:50 +08:00
parent 0e3dc97fd9 6ba9f001b9
commit b7ed33a1a0
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/MOS65XX/MOS65XXDisassembler.c
View File

@ -364,13 +364,13 @@ static int getInstructionLength(mos65xx_address_mode am)
case MOS65XX_AM_ZPY:
case MOS65XX_AM_ZP:
case MOS65XX_AM_REL:
case MOS65XX_AM_INDX:
case MOS65XX_AM_INDY:
return 2;
case MOS65XX_AM_ABS:
case MOS65XX_AM_ABSX:
case MOS65XX_AM_ABSY:
case MOS65XX_AM_INDX:
case MOS65XX_AM_INDY:
case MOS65XX_AM_IND:
return 3;
default:
@ -496,11 +496,11 @@ void MOS65XX_printInst(MCInst *MI, struct SStream *O, void *PrinterInfo)
break;
case MOS65XX_AM_INDX:
SStream_concat(O, " ($%04X,x)", value);
SStream_concat(O, " ($%02X,x)", value);
break;
case MOS65XX_AM_INDY:
SStream_concat(O, " ($%04X),y", value);
SStream_concat(O, " ($%02X),y", value);
break;
}
#endif

2
bindings/python/test_mos65xx.py
View File

@ -6,7 +6,7 @@ from capstone import *
from capstone.mos65xx import *
from xprint import to_hex, to_x
MOS65XX_CODE = b"\x0d\x34\x12\x00\x81\x65\x87\x6c\x01\x00\x85\xFF\x10\x00\x19\x42\x42\x00\x49\x42"
MOS65XX_CODE = b"\x0d\x34\x12\x00\x81\x65\x6c\x01\x00\x85\xFF\x10\x00\x19\x42\x42\x00\x49\x42"
address_modes=[
'No address mode',

2
tests/test_basic.c
View File

@ -89,7 +89,7 @@ static void test()
#endif
#ifdef CAPSTONE_HAS_MOS65XX
#define MOS65XX_CODE "\x0d\x34\x12\x00\x81\x65\x87\x6c\x01\x00\x85\xFF\x10\x00\x19\x42\x42\x00\x49\x42"
#define MOS65XX_CODE "\x0d\x34\x12\x00\x81\x65\x6c\x01\x00\x85\xFF\x10\x00\x19\x42\x42\x00\x49\x42"
#endif
#define EBPF_CODE "\x97\x09\x00\x00\x37\x13\x03\x00\xdc\x02\x00\x00\x20\x00\x00\x00\x30\x00\x00\x00\x00\x00\x00\x00\xdb\x3a\x00\x01\x00\x00\x00\x00\x84\x02\x00\x00\x00\x00\x00\x00\x6d\x33\x17\x02\x00\x00\x00\x00"

2
tests/test_mos65xx.c
View File

@ -103,7 +103,7 @@ static void print_insn_detail(cs_insn *ins)
static void test()
{
#define MOS65XX_CODE "\x0d\x34\x12\x00\x81\x65\x87\x6c\x01\x00\x85\xFF\x10\x00\x19\x42\x42\x00\x49\x42"
#define MOS65XX_CODE "\x0d\x34\x12\x00\x81\x87\x6c\x01\x00\x85\xFF\x10\x00\x19\x42\x42\x00\x49\x42"
struct platform platforms[] = {
{