mykola/blackjack
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix warnings, add test code

Browse source
This commit is contained in:
mykola2312 2024-08-16 14:34:09 +03:00
parent 5d23c4e695
commit 8181aa5623
2 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/rtdisasm.c
View file

@ -66,7 +66,7 @@ static int test_vex_prefix(const uint8_t vex_first)
// returns -1 if not rex, and non-negative is REX_* define // returns -1 if not rex, and non-negative is REX_* define
static int test_rex_prefix(const uint8_t rex) static int test_rex_prefix(const uint8_t rex)
{ {
if (rex & REX_MASK != REX_SIG) return -1; if ((rex & REX_MASK) != REX_SIG) return -1;
const uint8_t rex_value = rex & REX_VALUE_MASK; const uint8_t rex_value = rex & REX_VALUE_MASK;
switch (rex_value) switch (rex_value)
@ -113,7 +113,7 @@ static const instruction_t* find_instruction(const uint8_t* cur, unsigned type,
} }
// now let's match the opreg encoded byte // now let's match the opreg encoded byte
if (cur[plain_len] & OPREG_MASK != ins->opcode[plain_len]) if ((cur[plain_len] & OPREG_MASK) != ins->opcode[plain_len])
continue; continue;
} }
else else
@ -179,7 +179,7 @@ static void analyze_modrm(const uint8_t modrm, uint8_t* has_sib, uint8_t* disp_l
// set proper values // set proper values
for (unsigned i = 0; i < modrm_encodings_len; i++) for (unsigned i = 0; i < modrm_encodings_len; i++)
{ {
modrm_encoding_t* encoding = &modrm_encodings[i]; const modrm_encoding_t* encoding = &modrm_encodings[i];
if (encoding->mod == mod && encoding->rm == rm) if (encoding->mod == mod && encoding->rm == rm)
{ {
*has_sib = encoding->has_sib; *has_sib = encoding->has_sib;
@ -196,6 +196,8 @@ static unsigned imm2length(uint8_t imm)
case IMM_W: return 2; case IMM_W: return 2;
case IMM_D: return 4; case IMM_D: return 4;
case IMM_O: return 8; case IMM_O: return 8;
default: return 0;
} }
} }
@ -209,6 +211,8 @@ static unsigned value2length(uint8_t value)
case VALUE_P: return 6; case VALUE_P: return 6;
case VALUE_O: return 8; case VALUE_O: return 8;
case VALUE_T: return 10; case VALUE_T: return 10;
default: return 0;
} }
} }

6
src/rtdisasm_test.c
View file

@ -1,8 +1,14 @@
#include "rtdisasm.h" #include "rtdisasm.h"
#include <stdio.h> #include <stdio.h>
extern void test_1();
extern void test_1_end();
int main() int main()
{ {
size_t size = (uintptr_t)test_1_end - (uintptr_t)test_1;
int len = rtdisasm_analyze_single((const uint8_t*)test_1, size);
printf("len %d\n", len);
return 0; return 0;
} }