Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch/hppa/hppa Add some space to the output.
details: https://anonhg.NetBSD.org/src/rev/7aea572eb91a
branches: trunk
changeset: 772813:7aea572eb91a
user: skrll <skrll%NetBSD.org@localhost>
date: Tue Jan 17 12:08:43 2012 +0000
description:
Add some space to the output.
diffstat:
sys/arch/hppa/hppa/db_disasm.c | 154 ++++++++++++++++++++--------------------
1 files changed, 77 insertions(+), 77 deletions(-)
diffs (truncated from 522 to 300 lines):
diff -r 0d58c4b2e07f -r 7aea572eb91a sys/arch/hppa/hppa/db_disasm.c
--- a/sys/arch/hppa/hppa/db_disasm.c Tue Jan 17 10:56:56 2012 +0000
+++ b/sys/arch/hppa/hppa/db_disasm.c Tue Jan 17 12:08:43 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: db_disasm.c,v 1.13 2012/01/16 09:01:35 skrll Exp $ */
+/* $NetBSD: db_disasm.c,v 1.14 2012/01/17 12:08:43 skrll Exp $ */
/* $OpenBSD: db_disasm.c,v 1.9 2000/04/18 20:02:45 mickey Exp $ */
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: db_disasm.c,v 1.13 2012/01/16 09:01:35 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_disasm.c,v 1.14 2012/01/17 12:08:43 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1296,7 +1296,7 @@
int
addDasm(const struct inst *i, OFS ofs, union insn w)
{
- db_printf("%s\t%%r%d,%%r%d,%%r%d",addDCond(Cond4(w)),
+ db_printf("%s\t%%r%d, %%r%d, %%r%d",addDCond(Cond4(w)),
Rsa(w),Rsb(w),Rtc(w));
return (1);
}
@@ -1307,9 +1307,9 @@
{
db_printf(unitDCond(Cond4(w)));
if (Match("dcor") || Match("idcor"))
- db_printf("\t%%r%d,%%r%d",Rsb(w),Rtc(w));
+ db_printf("\t%%r%d, %%r%d",Rsb(w),Rtc(w));
else
- db_printf("\t%%r%d,%%r%d,%%r%d",Rsa(w),Rsb(w),Rtc(w));
+ db_printf("\t%%r%d, %%r%d, %%r%d",Rsa(w),Rsb(w),Rtc(w));
return (1);
}
@@ -1318,10 +1318,10 @@
iaDasm(const struct inst *i, OFS ofs, union insn w)
{
if (Match("addi"))
- db_printf("%s\t%d,%%r%d,%%r%d",
+ db_printf("%s\t%d, %%r%d, %%r%d",
addDCond(Cond4(w)),Im11(w),Rsb(w),Rta(w));
else
- db_printf("%s\t%d,%%r%d,%%r%d",
+ db_printf("%s\t%d, %%r%d, %%r%d",
subDCond(Cond4(w)),Im11(w),Rsb(w),Rta(w));
return (1);
}
@@ -1331,10 +1331,10 @@
shdDasm(const struct inst *i, OFS ofs, union insn w)
{
if (Match("vshd"))
- db_printf("%s\t%%r%d,%%r%d,%%r%d",
+ db_printf("%s\t%%r%d, %%r%d, %%r%d",
edDCond(Cond(w)), Rsa(w),Rsb(w),Rtc(w));
else
- db_printf("%s\t%%r%d,%%r%d,%d,%%r%d",
+ db_printf("%s\t%%r%d, %%r%d, %d, %%r%d",
edDCond(Cond(w)),Rsa(w),Rsb(w),31-Imd5(w),Rtc(w));
return (1);
}
@@ -1343,7 +1343,7 @@
int
extrDasm(const struct inst *i, OFS ofs, union insn w)
{
- db_printf("%s\t%%r%d,%d,%d,%%r%d",
+ db_printf("%s\t%%r%d, %d, %d, %%r%d",
edDCond(Cond(w)),Rsb(w),Imd5(w),32 - Rsc(w),Rta(w));
return (1);
}
@@ -1353,7 +1353,7 @@
int
vextrDasm(const struct inst *i, OFS ofs, union insn w)
{
- db_printf("%s\t%%r%d,%d,%%r%d",
+ db_printf("%s\t%%r%d, %d, %%r%d",
edDCond(Cond(w)),Rsb(w),32 - Rsc(w),Rta(w));
return (1);
}
@@ -1363,7 +1363,7 @@
int
depDasm(const struct inst *i, OFS ofs, union insn w)
{
- db_printf("%s\t%%r%d,%d,%d,%%r%d",
+ db_printf("%s\t%%r%d, %d, %d, %%r%d",
edDCond(Cond(w)),Rsa(w),31 - Imd5(w),32 - Rsc(w),Rtb(w));
return (1);
}
@@ -1373,7 +1373,7 @@
int
vdepDasm(const struct inst *i, OFS ofs, union insn w)
{
- db_printf("%s\t%%r%d,%d,%%r%d",
+ db_printf("%s\t%%r%d, %d, %%r%d",
edDCond(Cond(w)),Rsa(w),32 - Rsc(w),Rtb(w));
return (1);
}
@@ -1383,7 +1383,7 @@
int
depiDasm(const struct inst *i, OFS ofs, union insn w)
{
- db_printf("%s\t%d,%d,%d,%%r%d",
+ db_printf("%s\t%d, %d, %d, %%r%d",
edDCond(Cond(w)),Ima5(w),31 - Imd5(w),32 - Imc5A(w),Rtb(w));
return (1);
}
@@ -1392,7 +1392,7 @@
int
vdepiDasm(const struct inst *i, OFS ofs, union insn w)
{
- db_printf("%s\t%d,%d,%%r%d",edDCond(Cond(w)),Ima5(w),32-Imc5A(w),Rtb(w));
+ db_printf("%s\t%d, %d, %%r%d",edDCond(Cond(w)),Ima5(w),32-Imc5A(w),Rtb(w));
return (1);
}
@@ -1517,14 +1517,14 @@
s[0] = '\0';
if (Rsb(w) == 0 && Match("ldo")) {
- db_printf("ldi\t%s%X,%%r%d",s,d,Rta(w));
+ db_printf("ldi\t%s%X, %%r%d",s,d,Rta(w));
return (1);
}
db_printf("%s\t%s%s%X",i->mnem,(d < 2048? "R'":""), s, d);
if (Dss(w))
- db_printf("(%%sr%d,%%r%d),%%r%d",Dss(w),Rsb(w),Rta(w));
+ db_printf("(%%sr%d, %%r%d), %%r%d",Dss(w),Rsb(w),Rta(w));
else
- db_printf("(%%r%d),%%r%d",Rsb(w),Rta(w));
+ db_printf("(%%r%d), %%r%d",Rsb(w),Rta(w));
return (1);
}
@@ -1535,7 +1535,7 @@
int d = Disp(w);
char s[2];
- db_printf("\t%%r%d,",Rta(w));
+ db_printf("\t%%r%d, ",Rta(w));
s[1] = '\0';
if (d < 0) {
@@ -1547,7 +1547,7 @@
db_printf("%s%s%X", (d < 2048? "R'":""), s, d);
if (Dss(w))
- db_printf("(%%sr%d,%%r%d)",Dss(w),Rsb(w));
+ db_printf("(%%sr%d, %%r%d)",Dss(w),Rsb(w));
else
db_printf("(%%r%d)",Rsb(w));
return (1);
@@ -1581,9 +1581,9 @@
db_printf("%s\t%%r%d", p, Rsa(w));
if (Dss(w))
- db_printf("(%%sr%d,%%r%d),%%r%d",Dss(w),Rsb(w),Rtc(w));
+ db_printf("(%%sr%d, %%r%d), %%r%d",Dss(w),Rsb(w),Rtc(w));
else
- db_printf("(%%r%d),%%r%d",Rsb(w),Rtc(w));
+ db_printf("(%%r%d), %%r%d",Rsb(w),Rtc(w));
return (1);
}
@@ -1603,9 +1603,9 @@
case SEQPASS: p = ",q"; break;
case PREFETCH: p = ",p"; break;
}
- db_printf("%s\t%%r%d,", p, Rta(w));
+ db_printf("%s\t%%r%d, ", p, Rta(w));
if (Dss(w))
- db_printf("%d(%%sr%d,%%r%d)",Imc5(w),Dss(w),Rsb(w));
+ db_printf("%d(%%sr%d, %%r%d)",Imc5(w),Dss(w),Rsb(w));
else
db_printf("%d(%%r%d)",Imc5(w),Rsb(w));
return (1);
@@ -1627,9 +1627,9 @@
case SEQPASS: p = ",r"; break;
case PREFETCH: p = ",z"; break;
}
- db_printf("%s\t%%r%d,", p, Rta(w));
+ db_printf("%s\t%%r%d, ", p, Rta(w));
if (Dss(w))
- db_printf("%d(%%sr%d,%%r%d)",Imc5(w),Dss(w),Rsb(w));
+ db_printf("%d(%%sr%d, %%r%d)",Imc5(w),Dss(w),Rsb(w));
else
db_printf("%d(%%r%d)",Imc5(w),Rsb(w));
return (1);
@@ -1639,7 +1639,7 @@
int
limmDasm(const struct inst *i, OFS ofs, union insn w)
{
- db_printf("\tL'%X,%%r%d", Im21(w), Rtb(w));
+ db_printf("\tL'%X, %%r%d", Im21(w), Rtb(w));
return (1);
}
@@ -1660,7 +1660,7 @@
db_printsym((db_addr_t)tgtofs, DB_STGY_ANY, db_printf);
if (link || Match("gate"))
- db_printf(",%%r%d",link);
+ db_printf(", %%r%d",link);
return (1);
}
@@ -1669,7 +1669,7 @@
int
brDasm(const struct inst *i, OFS ofs, union insn w)
{
- db_printf("%s\t%%r%d,%%r%d", Nu(w)?",n":"", Rsa(w), Rtb(w));
+ db_printf("%s\t%%r%d, %%r%d", Nu(w)?",n":"", Rsa(w), Rtb(w));
return (1);
}
@@ -1697,7 +1697,7 @@
s[0] = '\0';
p = Nu(w)? ",n":"";
- db_printf("%s\tR'%s%X(%%sr%d,%%r%d)", p,
+ db_printf("%s\tR'%s%X(%%sr%d, %%r%d)", p,
s, d, Sr(w), Rsb(w));
return (1);
}
@@ -1715,7 +1715,7 @@
db_printf(addDCond(Cond(w) << 1));
else
db_printf(subDCond(Cond(w) << 1));
- db_printf("%s\t%%r%d,%%r%d,", Nu(w)?",n":"", Rsa(w), Rsb(w));
+ db_printf("%s\t%%r%d, %%r%d,", Nu(w)?",n":"", Rsa(w), Rsb(w));
db_printsym((db_addr_t)tgtofs, DB_STGY_ANY, db_printf);
return (1);
}
@@ -1732,7 +1732,7 @@
db_printf(addDCond(Cond(w) << 1));
else
db_printf(subDCond(Cond(w) << 1));
- db_printf("%s\t%d,%%r%d,", Nu(w)? ",n":"", Ima5(w), Rsb(w));
+ db_printf("%s\t%d, %%r%d, ", Nu(w)? ",n":"", Ima5(w), Rsb(w));
db_printsym((db_addr_t)tgtofs, DB_STGY_ANY, db_printf);
return (1);
}
@@ -1747,9 +1747,9 @@
db_printf(edDCond(Cond(w)));
p = Nu(w)? ",n":"";
if (Match("bvb"))
- db_printf("%s\t%%r%d,", p, Rta(w));
+ db_printf("%s\t%%r%d, ", p, Rta(w));
else
- db_printf("%s\t%%r%d,%d,", p, Rsa(w), Imb5(w));
+ db_printf("%s\t%%r%d, %d, ", p, Rsa(w), Imb5(w));
db_printsym((db_addr_t)tgtofs, DB_STGY_ANY, db_printf);
return (1);
}
@@ -1762,9 +1762,9 @@
if (Rsa(w) == 0 && Rtc(w) == 0)
db_printf("nop");
else
- db_printf("copy\t%%r%d,%%r%d",Rsa(w),Rtc(w));
+ db_printf("copy\t%%r%d, %%r%d",Rsa(w),Rtc(w));
} else
- db_printf("%s%s\t%%r%d,%%r%d,%%r%d", i->mnem,
+ db_printf("%s%s\t%%r%d, %%r%d, %%r%d", i->mnem,
subDCond(Cond4(w)), Rsa(w),Rsb(w),Rtc(w));
return(1);
}
@@ -1777,22 +1777,22 @@
if (Rtb(w) == 11)
db_printf("mtsar\t%%r%d",Rsa(w));
else
- db_printf("mtctl\t%%r%d,%%cr%d",Rsa(w),Rtb(w));
+ db_printf("mtctl\t%%r%d, %%cr%d",Rsa(w),Rtb(w));
return (1);
}
db_printf(i->mnem);
if (Match("ssm") || Match("rsm"))
- db_printf("\t%d,%%r%d",Ima5A(w),Rtc(w));
+ db_printf("\t%d, %%r%d",Ima5A(w),Rtc(w));
else if (Match("mtsm")) db_printf("\t%%r%d",Rsa(w));
else if (Match("ldprid")) db_printf("\t%%r%d",Rtc(w));
- else if (Match("mtsp")) db_printf("\t%%r%d,%%sr%d",Rsa(w),Sr(w));
- else if (Match("mfsp")) db_printf("\t%%sr%d,%%r%d",Sr(w),Rtc(w));
- else if (Match("mfctl")) db_printf("\t%%cr%d,%%r%d",Rsb(w),Rtc(w));
+ else if (Match("mtsp")) db_printf("\t%%r%d, %%sr%d",Rsa(w),Sr(w));
+ else if (Match("mfsp")) db_printf("\t%%sr%d, %%r%d",Sr(w),Rtc(w));
+ else if (Match("mfctl")) db_printf("\t%%cr%d, %%r%d",Rsb(w),Rtc(w));
else if (Match("ldsid")) {
if (Dss(w))
- db_printf("\t(%%sr%d,%%r%d),%%r%d",Dss(w),Rsb(w),Rtc(w));
+ db_printf("\t(%%sr%d, %%r%d), %%r%d",Dss(w),Rsb(w),Rtc(w));
else
- db_printf("\t(%%r%d),%%r%d",Rsb(w),Rtc(w));
+ db_printf("\t(%%r%d), %%r%d",Rsb(w),Rtc(w));
} else {
db_printf("?????");
return (0);
@@ -1807,17 +1807,17 @@
Home |
Main Index |
Thread Index |
Old Index