From aa6ad9d79164a448d1018cd2bfa855dfbeb48155 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Sat, 11 Sep 2004 15:25:38 +0000 Subject: [PATCH] (NSC_SITYPE): New. (dchr_ca): Use it to fix selector pkg's ca_type. --- src/lib/commands/xdump.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/lib/commands/xdump.c b/src/lib/commands/xdump.c index 94f31aae..a4b6308e 100644 --- a/src/lib/commands/xdump.c +++ b/src/lib/commands/xdump.c @@ -77,17 +77,26 @@ */ /* FIXME document dump format */ +/* FIXME don't dump stuff that's useless due to options */ /* Selector descriptors for characteristics tables */ /* FIXME belongs into src/lib/global/ */ +/* Return nsc_type for a signed integer with the same size as TYPE. */ +#define NSC_SITYPE(type) \ + (sizeof(type) == 1 ? NSC_CHAR \ + : sizeof(type) == sizeof(short) ? NSC_SHORT \ + : sizeof(type) == sizeof(int) ? NSC_INT \ + : sizeof(type) == sizeof(long) ? NSC_LONG \ + : 1/0) + static struct castr dchr_ca[] = { {NSC_STRING, 0, 0, offsetof(struct dchrstr, d_name), "name"}, {NSC_INT, 0, 0, offsetof(struct dchrstr, d_mnem), "mnem"}, {NSC_INT, 0, 0, offsetof(struct dchrstr, d_prd), "prd"}, {NSC_INT, 0, 0, offsetof(struct dchrstr, d_mcst), "mcst"}, {NSC_INT, 0, 0, offsetof(struct dchrstr, d_flg), "flg"}, - {NSC_INT, 0, 0, offsetof(struct dchrstr, d_pkg), "pkg"}, + {NSC_SITYPE(i_packing), 0, 0, offsetof(struct dchrstr, d_pkg), "pkg"}, {NSC_FLOAT, 0, 0, offsetof(struct dchrstr, d_ostr), "ostr"}, {NSC_FLOAT, 0, 0, offsetof(struct dchrstr, d_dstr), "dstr"}, {NSC_INT, 0, 0, offsetof(struct dchrstr, d_value), "value"},