diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2017-06-23 14:48:08 -0700 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2017-06-23 14:48:08 -0700 |
| commit | aac369d5b03a1e2b217f030c8d879173bdb3d06e (patch) | |
| tree | 15390d749f0b684253cb362613cecb0cdbdbc56a /output/outdbg.c | |
| parent | 869087d53dc9e30d80ae7d265ca95a95f7190d1d (diff) | |
| parent | df1eec03152742413927032325710450cdc425b9 (diff) | |
| download | nasm-aac369d5b03a1e2b217f030c8d879173bdb3d06e.tar.gz | |
Merge remote-tracking branch 'origin/nasm-2.13.xx'
Resolved Conflicts:
common/common.c
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'output/outdbg.c')
| -rw-r--r-- | output/outdbg.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/output/outdbg.c b/output/outdbg.c index 13995595..b7b6ef04 100644 --- a/output/outdbg.c +++ b/output/outdbg.c @@ -194,7 +194,7 @@ static void dbg_out(const struct out_data *data) fprintf(ofile, " wrt %"PRIx32, data->twrt); } if (data->type == OUT_RELADDR) - fprintf(ofile, " relbase %"PRId64, data->relbase); + fprintf(ofile, " relbase %"PRIx64, data->relbase); putc('\n', ofile); @@ -248,8 +248,8 @@ static void dbg_legacy_out(int32_t segto, const void *data, fprintf(ofile, " legacy: out to %"PRIx32", len = %d: ", segto, (int)abs((int)size)); else - fprintf(ofile, " legacy: out to %"PRIx32", len = %"PRIu64": ", - segto, size); + fprintf(ofile, " legacy: out to %"PRIx32", len = %"PRId64" (0x%"PRIx64"): ", + segto, (int64_t)size, size); switch (type) { case OUT_RESERVE: |