length = sizeof(int) * 8;
}
for (i = 0; i < length-1; i++) {
- buf[i] = ((val & ((long long)1<<i)) ? '1' : '.');
+ buf[i] = ((val & (1LL << i)) ? '1' : '.');
}
cp = buf;
break;
}
void
-diag_vdump_buf_with_offset(__printf_fun *pf,
- cyg_uint8 *p,
- CYG_ADDRWORD s,
- cyg_uint8 *base)
+diag_vdump_buf_with_offset(__printf_fun *pf, void *_p, CYG_ADDRWORD s,
+ void *base)
{
int i, c;
+ cyg_uint8 *p = (cyg_uint8 *)_p;
- if ((CYG_ADDRWORD)s > (CYG_ADDRWORD)p) {
- s = (CYG_ADDRWORD)s - (CYG_ADDRWORD)p;
+ if (s > (CYG_ADDRWORD)p) {
+ s = s - (CYG_ADDRWORD)p;
}
while ((int)s > 0) {
- if (base) {
- pf("%08X: ", (CYG_ADDRWORD)p - (CYG_ADDRWORD)base);
- } else {
- pf("%08X: ", p);
- }
+ pf("%08X: ", (CYG_ADDRWORD)p - (CYG_ADDRWORD)base);
for (i = 0; i < 16; i++) {
if (i < (int)s) {
- pf("%02X ", p[i] & 0xFF);
+ pf("%02X ", p[i]);
} else {
pf(" ");
}
pf(" |");
for (i = 0; i < 16; i++) {
if (i < (int)s) {
- c = p[i] & 0xFF;
+ c = p[i];
if ((c < 0x20) || (c >= 0x7F)) c = '.';
} else {
c = ' ';
}
void
-diag_dump_buf_with_offset(cyg_uint8 *p,
- CYG_ADDRWORD s,
- cyg_uint8 *base)
+diag_dump_buf_with_offset(void *p, CYG_ADDRWORD s, void *base)
{
diag_vdump_buf_with_offset(diag_printf, p, s, base);
}
void
diag_dump_buf(void *p, CYG_ADDRWORD s)
{
- diag_dump_buf_with_offset((cyg_uint8 *)p, s, 0);
+ diag_dump_buf_with_offset(p, s, 0);
}
void
-diag_dump_buf_with_offset_32bit(cyg_uint32 *p,
- CYG_ADDRWORD s,
- cyg_uint32 *base)
+diag_dump_buf_with_offset_32bit(void *_p, CYG_ADDRWORD s,
+ void *base)
{
int i;
+ cyg_uint32 *p = (cyg_uint32 *)_p;
if ((CYG_ADDRWORD)s > (CYG_ADDRWORD)p) {
s = (CYG_ADDRWORD)s - (CYG_ADDRWORD)p;
}
while ((int)s > 0) {
- if (base) {
- diag_printf("%08X: ", (CYG_ADDRWORD)p - (CYG_ADDRWORD)base);
- } else {
- diag_printf("%08X: ", (CYG_ADDRWORD)p);
- }
+ diag_printf("%08X: ", (CYG_ADDRWORD)p - (CYG_ADDRWORD)base);
for (i = 0; i < 4; i++) {
if (i < (int)s / 4) {
diag_printf("%08X ", p[i]);
externC void
diag_dump_buf_32bit(void *p, CYG_ADDRWORD s)
{
- diag_dump_buf_with_offset_32bit((cyg_uint32 *)p, s, 0);
+ diag_dump_buf_with_offset_32bit(p, s, 0);
}
void
-diag_dump_buf_with_offset_16bit(cyg_uint16 *p,
- CYG_ADDRWORD s,
- cyg_uint16 *base)
+diag_dump_buf_with_offset_16bit(void *_p, CYG_ADDRWORD s,
+ void *base)
{
int i;
+ cyg_uint16 * p = (cyg_uint16 *)_p;
+
if ((CYG_ADDRWORD)s > (CYG_ADDRWORD)p) {
s = (CYG_ADDRWORD)s - (CYG_ADDRWORD)p;
}
while ((int)s > 0) {
- if (base) {
- diag_printf("%08X: ", (CYG_ADDRWORD)p - (CYG_ADDRWORD)base);
- } else {
- diag_printf("%08X: ", (CYG_ADDRWORD)p);
- }
+ diag_printf("%08X: ", (CYG_ADDRWORD)p - (CYG_ADDRWORD)base);
for (i = 0; i < 8; i++) {
if (i < (int)s / 2) {
diag_printf("%04X ", p[i]);
externC void
diag_dump_buf_16bit(void *p, CYG_ADDRWORD s)
{
- diag_dump_buf_with_offset_16bit((cyg_uint16 *)p, s, 0);
+ diag_dump_buf_with_offset_16bit(p, s, 0);
}
/*-----------------------------------------------------------------------*/