diff options
| author | Ian Lynagh <igloo@earth.li> | 2012-04-26 16:52:44 +0100 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2012-04-26 16:52:44 +0100 |
| commit | 1dbe6d59b621ab9bd836241d633b3a8d99812cb3 (patch) | |
| tree | 6482c2019a3a85f93c9b38c0e985d77f24388692 /rts/Disassembler.c | |
| parent | 3e314cc2060734ade9b82d4da418c119b3a05b4c (diff) | |
| download | haskell-1dbe6d59b621ab9bd836241d633b3a8d99812cb3.tar.gz | |
Fix warnings on Win64
Mostly this meant getting pointer<->int conversions to use the right
sizes. lnat is now size_t, rather than unsigned long, as that seems a
better match for how it's used.
Diffstat (limited to 'rts/Disassembler.c')
| -rw-r--r-- | rts/Disassembler.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/rts/Disassembler.c b/rts/Disassembler.c index d043e1d012..4bb53c64ed 100644 --- a/rts/Disassembler.c +++ b/rts/Disassembler.c @@ -75,12 +75,12 @@ disInstr ( StgBCO *bco, int pc ) instrs[pc], (signed int)instrs[pc+1]); pc += 2; break; case bci_CCALL: - debugBelch("CCALL marshaller at 0x%lx\n", + debugBelch("CCALL marshaller at 0x%" FMT_HexSizeT "\n", literals[instrs[pc]] ); pc += 1; break; case bci_STKCHECK: { StgWord stk_words_reqd = BCO_GET_LARGE_ARG + 1; - debugBelch("STKCHECK %lu\n", (lnat)stk_words_reqd ); + debugBelch("STKCHECK %" FMT_SizeT "\n", (lnat)stk_words_reqd ); break; } case bci_PUSH_L: @@ -130,7 +130,7 @@ disInstr ( StgBCO *bco, int pc ) case bci_PUSH_UBX: debugBelch("PUSH_UBX "); for (i = 0; i < instrs[pc+1]; i++) - debugBelch("0x%lx ", literals[i + instrs[pc]] ); + debugBelch("0x%" FMT_HexSizeT " ", literals[i + instrs[pc]] ); debugBelch("\n"); pc += 2; break; case bci_PUSH_APPLY_N: @@ -199,29 +199,29 @@ disInstr ( StgBCO *bco, int pc ) case bci_TESTLT_I: { unsigned int discr = BCO_NEXT; int failto = BCO_GET_LARGE_ARG; - debugBelch("TESTLT_I %ld, fail to %d\n", literals[discr], failto); + debugBelch("TESTLT_I %" FMT_Int ", fail to %d\n", literals[discr], failto); break; } case bci_TESTEQ_I: - debugBelch("TESTEQ_I %ld, fail to %d\n", literals[instrs[pc]], + debugBelch("TESTEQ_I %" FMT_Int ", fail to %d\n", literals[instrs[pc]], instrs[pc+1]); pc += 2; break; case bci_TESTLT_F: - debugBelch("TESTLT_F %ld, fail to %d\n", literals[instrs[pc]], + debugBelch("TESTLT_F %" FMT_Int ", fail to %d\n", literals[instrs[pc]], instrs[pc+1]); pc += 2; break; case bci_TESTEQ_F: - debugBelch("TESTEQ_F %ld, fail to %d\n", literals[instrs[pc]], + debugBelch("TESTEQ_F %" FMT_Int ", fail to %d\n", literals[instrs[pc]], instrs[pc+1]); pc += 2; break; case bci_TESTLT_D: - debugBelch("TESTLT_D %ld, fail to %d\n", literals[instrs[pc]], + debugBelch("TESTLT_D %" FMT_Int ", fail to %d\n", literals[instrs[pc]], instrs[pc+1]); pc += 2; break; case bci_TESTEQ_D: - debugBelch("TESTEQ_D %ld, fail to %d\n", literals[instrs[pc]], + debugBelch("TESTEQ_D %" FMT_Int ", fail to %d\n", literals[instrs[pc]], instrs[pc+1]); pc += 2; break; |