notaz.gp2x.de
/
ia32rtools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
plugin: rm all assume statements
[ia32rtools.git]
/
plugin
/
saveasm.cpp
diff --git
a/plugin/saveasm.cpp
b/plugin/saveasm.cpp
index
efe8e9d
..
5f704ef
100644
(file)
--- a/
plugin/saveasm.cpp
+++ b/
plugin/saveasm.cpp
@@
-43,6
+43,8
@@
static const char *reserved_names[] = {
"offset",
"aam",
"text",
"offset",
"aam",
"text",
+ "size",
+ "c",
};
static int is_name_reserved(const char *name)
};
static int is_name_reserved(const char *name)
@@
-333,9
+335,26
@@
static void idaapi run(int /*arg*/)
continue;
}
continue;
}
- if (is_name_reserved(name)) {
+ // rename vars with '?@' (funcs are ok)
+ int change_qat = 0;
+ ea_flags = get_flags_novalue(ea);
+ if (!isCode(ea_flags) && strpbrk(name, "?@"))
+ change_qat = 1;
+
+ if (change_qat || is_name_reserved(name)) {
msg("%x: renaming name '%s'\n", ea, name);
qsnprintf(buf, sizeof(buf), "%s_g", name);
msg("%x: renaming name '%s'\n", ea, name);
qsnprintf(buf, sizeof(buf), "%s_g", name);
+
+ if (change_qat) {
+ for (p = buf; *p != 0; p++) {
+ if (*p == '?' || *p == '@') {
+ qsnprintf(buf2, sizeof(buf2), "%02x", (unsigned char)*p);
+ memmove(p + 1, p, strlen(p) + 1);
+ memcpy(p, buf2, 2);
+ }
+ }
+ }
+
set_name(ea, buf);
}
}
set_name(ea, buf);
}
}
@@
-369,11
+388,6
@@
static void idaapi run(int /*arg*/)
do_def_line(buf, sizeof(buf), ln.down(), ea);
if (strstr(buf, "include"))
continue;
do_def_line(buf, sizeof(buf), ln.down(), ea);
if (strstr(buf, "include"))
continue;
- p = strstr(buf, "assume cs");
- if (p != NULL) {
- memmove(p + 1, p, strlen(p) + 1);
- *p = ';';
- }
fout_line++;
qfprintf(fout, "%s\n", buf);
fout_line++;
qfprintf(fout, "%s\n", buf);
@@
-389,14
+403,15
@@
static void idaapi run(int /*arg*/)
qstrncpy(p, "include imports.inc", sizeof(buf) - (p - buf));
fout_line++;
qfprintf(fout, "\n%s\n", buf);
qstrncpy(p, "include imports.inc", sizeof(buf) - (p - buf));
fout_line++;
qfprintf(fout, "\n%s\n", buf);
- continue;
+ i++;
+ break;
}
}
pl.lnnum = i;
for (;;)
{
}
}
pl.lnnum = i;
for (;;)
{
- int drop_large = 0, d
rop
_rva = 0, set_scale = 0, jmp_near = 0;
+ int drop_large = 0, d
o
_rva = 0, set_scale = 0, jmp_near = 0;
int word_imm = 0, dword_imm = 0, do_pushf = 0;
if ((ea >> 14) != ui_ea_block) {
int word_imm = 0, dword_imm = 0, do_pushf = 0;
if ((ea >> 14) != ui_ea_block) {
@@
-459,7
+474,7
@@
static void idaapi run(int /*arg*/)
}
else { // not code
if (isOff0(ea_flags))
}
else { // not code
if (isOff0(ea_flags))
- d
rop
_rva = 1;
+ d
o
_rva = 1;
}
pass:
}
pass:
@@
-477,11
+492,12
@@
pass:
if (p != NULL)
memmove(p, p + 6, strlen(p + 6) + 1);
}
if (p != NULL)
memmove(p, p + 6, strlen(p + 6) + 1);
}
- while (d
rop
_rva) {
+ while (d
o
_rva) {
p = strstr(fw, " rva ");
if (p == NULL)
break;
p = strstr(fw, " rva ");
if (p == NULL)
break;
- memmove(p, p + 4, strlen(p + 4) + 1);
+ memmove(p + 4 + 3, p + 4, strlen(p + 4) + 1);
+ memcpy(p + 1, "offset", 6);
}
if (set_scale) {
p = strchr(fw, '[');
}
if (set_scale) {
p = strchr(fw, '[');
@@
-533,7
+549,12
@@
pass:
}
}
}
}
- if (fw[0] == 'e' && IS_START(fw, "end") && fw[3] == ' ') {
+ if (fw[0] == 'a' && IS_START(fw, "assume cs")) {
+ // "assume cs" causes problems with ext syms
+ memmove(fw + 1, fw, strlen(fw) + 1);
+ *fw = ';';
+ }
+ else if (fw[0] == 'e' && IS_START(fw, "end") && fw[3] == ' ') {
fout_line++;
qfprintf(fout, "include public.inc\n\n");
fout_line++;
qfprintf(fout, "include public.inc\n\n");