Skip to content

Commit

Permalink
[pbc] Fix when TRACE_PACKFILE is enabled. Use special macro for the c…
Browse files Browse the repository at this point in the history 
…onverters,

git-svn-id: https://svn.parrot.org/parrot/trunk@36843 d31e2699-5ff4-0310-a27c-f18f2fbe73fe
  • Loading branch information
@rurban
rurban committed Feb 17, 2009
1 parent 16c2d55 commit b1fab04
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 12 deletions.
3 changes: 3 additions & 0 deletions include/parrot/packfile.h
View file
Expand Up @@ -48,12 +48,15 @@
# define TRACE_PRINTF(args) if (pf->options) Parrot_trace_eprintf args
# if TRACE_PACKFILE == 2
# define TRACE_PRINTF_VAL(args) if (pf->options & 2) Parrot_trace_eprintf args
# define TRACE_PRINTF_2(args) Parrot_trace_eprintf args
# else
# define TRACE_PRINTF_VAL(args)
# define TRACE_PRINTF_2(args)
# endif
#else
# define TRACE_PRINTF(args)
# define TRACE_PRINTF_VAL(args)
# define TRACE_PRINTF_2(args)
#endif

/*
Expand Down
24 changes: 12 additions & 12 deletions src/packfile/pf_items.c
View file
Expand Up @@ -377,12 +377,12 @@ cvt_num16_num12(ARGOUT(unsigned char *dest), ARGIN(const unsigned char *src))

memset(dest, 0, 12);
/* simply copy over sign + exp */
TRACE_PRINTF_VAL((" cvt_num16_num12: sign+exp=0x%2x\n", src[15]));
TRACE_PRINTF_2((" cvt_num16_num12: sign+exp=0x%2x\n", src[15]));
dest[11] = src[15];
dest[12] = src[14];
/* and trunc the rest */
memcpy(dest[10], src[13], 10);
TRACE_PRINTF_VAL((" cvt_num16_num12: mantissa=0x%10x, double=%lf\n",
TRACE_PRINTF_2((" cvt_num16_num12: mantissa=0x%10x, double=%lf\n",
src[13], (long double)dest));
}
#endif
Expand Down Expand Up @@ -433,7 +433,7 @@ cvt_num16_num8(ARGOUT(unsigned char *dest), ARGIN(const unsigned char *src))
double d;
memcpy(&d, src, 8);
ld = (long double)d; /* TODO: test compiler cast */
TRACE_PRINTF_VAL((" cvt_num16_num8: ld=%lf, d=%f\n", ld, d));
TRACE_PRINTF_2((" cvt_num16_num8: ld=%lf, d=%f\n", ld, d));
memcpy(dest, &ld, 16);

#else
Expand Down Expand Up @@ -536,7 +536,7 @@ cvt_num8_num16(ARGOUT(unsigned char *dest), ARGIN(const unsigned char *src))
double d;
memcpy(&d, src, 8);
ld = (long double)d; /* TODO: test compiler cast */
TRACE_PRINTF_VAL((" cvt_num8_num16: d=%f, ld=%lf\n", d, ld));
TRACE_PRINTF_2((" cvt_num8_num16: d=%f, ld=%lf\n", d, ld));
memcpy(dest, &ld, 16);
}

Expand All @@ -561,7 +561,7 @@ cvt_num8_num12(ARGOUT(unsigned char *dest), ARGIN(const unsigned char *src))
double d;
memcpy(&d, src, 8);
ld = (long double)d; /* TODO: test compiler cast */
TRACE_PRINTF_VAL((" cvt_num8_num12: ld=%lf, d=%f\n", ld, d));
TRACE_PRINTF_2((" cvt_num8_num12: ld=%lf, d=%f\n", ld, d));
memcpy(dest, &ld, 12);
}
#endif
Expand All @@ -586,7 +586,7 @@ cvt_num8_num12_be(ARGOUT(unsigned char *dest), ARGIN(const unsigned char *src))
ASSERT_ARGS(cvt_num8_num12_be)
unsigned char b[8];
fetch_buf_be_8(b, src); /* TODO test endianize */
TRACE_PRINTF_VAL((" cvt_num8_num12_be: 0x%8x\n", b));
TRACE_PRINTF_2((" cvt_num8_num12_be: 0x%8x\n", b));
cvt_num8_num12(dest, b);
}
#endif
Expand All @@ -610,7 +610,7 @@ cvt_num8_num16_le(ARGOUT(unsigned char *dest), ARGIN(const unsigned char *src))
ASSERT_ARGS(cvt_num8_num16_le)
unsigned char b[8];
fetch_buf_be_8(b, src); /* TODO test endianize */
TRACE_PRINTF_VAL((" cvt_num8_num16_le: 0x%8x\n", b));
TRACE_PRINTF_2((" cvt_num8_num16_le: 0x%8x\n", b));
cvt_num8_num16(dest, b);
}
#endif
Expand All @@ -634,7 +634,7 @@ cvt_num12_num16_le(ARGOUT(unsigned char *dest), ARGIN(const unsigned char *src))
ASSERT_ARGS(cvt_num12_num16_le)
unsigned char b[12];
fetch_buf_be_12(b, src); /* TODO test endianize */
TRACE_PRINTF_VAL((" cvt_num12_num16_le: 0x%8x\n", b));
TRACE_PRINTF_2((" cvt_num12_num16_le: 0x%8x\n", b));
cvt_num12_num16(dest, b);
}
#endif
Expand All @@ -658,7 +658,7 @@ cvt_num12_num8_le(ARGOUT(unsigned char *dest), ARGIN(unsigned char *src))
ASSERT_ARGS(cvt_num12_num8_le)
unsigned char b[12];
fetch_buf_le_12(b, src); /* TODO test endianize */
TRACE_PRINTF_VAL((" cvt_num12_num8_le: 0x%12x\n", b));
TRACE_PRINTF_2((" cvt_num12_num8_le: 0x%12x\n", b));
cvt_num12_num8(dest, b);
}
#endif
Expand All @@ -683,7 +683,7 @@ cvt_num16_num8_le(ARGOUT(unsigned char *dest), ARGIN(unsigned char *src))
ASSERT_ARGS(cvt_num16_num8_le)
unsigned char b[16];
fetch_buf_le_16(b, src);
TRACE_PRINTF_VAL((" cvt_num16_num8_le: 0x%16x\n", b));
TRACE_PRINTF_2((" cvt_num16_num8_le: 0x%16x\n", b));
cvt_num16_num8(dest, b);
}
#endif
Expand All @@ -707,7 +707,7 @@ cvt_num16_num8_be(ARGOUT(unsigned char *dest), ARGIN(const unsigned char *src))
ASSERT_ARGS(cvt_num16_num8_be)
unsigned char b[16];
fetch_buf_be_16(b, src);
TRACE_PRINTF_VAL((" cvt_num16_num8_be: 0x%16x\n", b));
TRACE_PRINTF_2((" cvt_num16_num8_be: 0x%16x\n", b));
cvt_num16_num8(dest, b);
}
#endif
Expand All @@ -731,7 +731,7 @@ cvt_num16_num12_be(ARGOUT(unsigned char *dest), ARGIN(const unsigned char *src))
ASSERT_ARGS(cvt_num16_num12_be)
unsigned char b[16];
fetch_buf_be_16(b, src);
TRACE_PRINTF_VAL((" cvt_num16_num12_be: 0x%16x\n", b));
TRACE_PRINTF_2((" cvt_num16_num12_be: 0x%16x\n", b));
cvt_num16_num12(dest, b);
}
#endif
Expand Down

0 comments on commit b1fab04

Please sign in to comment.