Commit eaa2a364 authored by Russ Cox's avatar Russ Cox

libmach: always print 0x on hex numbers

R=r
DELTA=3  (0 added, 0 deleted, 3 changed)
OCL=21558
CL=21558
parent 83348f95
...@@ -301,7 +301,7 @@ enum{ ...@@ -301,7 +301,7 @@ enum{
REXX = 1<<1, /* extend sib index */ REXX = 1<<1, /* extend sib index */
REXB = 1<<0 /* extend modrm r/m, sib base, or opcode reg */ REXB = 1<<0 /* extend modrm r/m, sib base, or opcode reg */
}; };
/* Operand Format codes */ /* Operand Format codes */
/* /*
%A - address size register modifier (!asize -> 'E') %A - address size register modifier (!asize -> 'E')
...@@ -361,7 +361,7 @@ enum { ...@@ -361,7 +361,7 @@ enum {
OPOVER, /* Operand size override */ OPOVER, /* Operand size override */
ADDOVER, /* Address size override */ ADDOVER, /* Address size override */
}; };
static Optable optab0F00[8]= static Optable optab0F00[8]=
{ {
[0x00] 0,0, "MOVW LDT,%e", [0x00] 0,0, "MOVW LDT,%e",
...@@ -859,7 +859,7 @@ static Optable optabD8[8+8] = ...@@ -859,7 +859,7 @@ static Optable optabD8[8+8] =
[0x0f] 0,0, "FDIVRD %f,F0", [0x0f] 0,0, "FDIVRD %f,F0",
}; };
/* /*
* optabD9 and optabDB use the following encoding: * optabD9 and optabDB use the following encoding:
* if (0 <= modrm <= 2) instruction = optabDx[modrm&0x07]; * if (0 <= modrm <= 2) instruction = optabDx[modrm&0x07];
* else instruction = optabDx[(modrm&0x3f)+8]; * else instruction = optabDx[(modrm&0x3f)+8];
* *
...@@ -1931,7 +1931,7 @@ immediate(Instr *ip, vlong val) ...@@ -1931,7 +1931,7 @@ immediate(Instr *ip, vlong val)
w = -w; w = -w;
if (issymref(ip, &s, w, val)) { if (issymref(ip, &s, w, val)) {
if (w) if (w)
bprint(ip, "%s+%lux(SB)", s.name, w); bprint(ip, "%s+%#lux(SB)", s.name, w);
else else
bprint(ip, "%s(SB)", s.name); bprint(ip, "%s(SB)", s.name);
return; return;
...@@ -1942,7 +1942,7 @@ immediate(Instr *ip, vlong val) ...@@ -1942,7 +1942,7 @@ immediate(Instr *ip, vlong val)
if (w < 0) if (w < 0)
w = -w; w = -w;
if (w < 4096) { if (w < 4096) {
bprint(ip, "%s-%lux(SB)", s.name, w); bprint(ip, "%s-%#lux(SB)", s.name, w);
return; return;
} }
} }
...@@ -2250,7 +2250,7 @@ i386foll(Map *map, uvlong pc, Rgetter rget, uvlong *foll) ...@@ -2250,7 +2250,7 @@ i386foll(Map *map, uvlong pc, Rgetter rget, uvlong *foll)
return 1; return 1;
default: default:
break; break;
} }
if (strncmp(op->proto,"JMP", 3) == 0 || strncmp(op->proto,"CALL", 4) == 0) if (strncmp(op->proto,"JMP", 3) == 0 || strncmp(op->proto,"CALL", 4) == 0)
return 1; return 1;
foll[n++] = pc+i.n; foll[n++] = pc+i.n;
......
...@@ -113,7 +113,7 @@ symoff(char *buf, int n, uvlong v, int space) ...@@ -113,7 +113,7 @@ symoff(char *buf, int n, uvlong v, int space)
if (s.type != 't' && s.type != 'T' && delta >= 4096) if (s.type != 't' && s.type != 'T' && delta >= 4096)
return snprint(buf, n, "%llux", v); return snprint(buf, n, "%llux", v);
else if (delta) else if (delta)
return snprint(buf, n, "%s+%lux", s.name, delta); return snprint(buf, n, "%s+%#lux", s.name, delta);
else else
return snprint(buf, n, "%s", s.name); return snprint(buf, n, "%s", s.name);
} }
...@@ -150,7 +150,7 @@ fpformat(Map *map, Reglist *rp, char *buf, int n, int modif) ...@@ -150,7 +150,7 @@ fpformat(Map *map, Reglist *rp, char *buf, int n, int modif)
if (rp->rformat == 'F') if (rp->rformat == 'F')
return 1; return 1;
return 2; return 2;
} }
/* treat it like 'f' */ /* treat it like 'f' */
if (get1(map, rp->roffs, (uchar *)reg, 4) < 0) if (get1(map, rp->roffs, (uchar *)reg, 4) < 0)
return -1; return -1;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment