-// D_rlong deposits a MWC "canonical byte order" longword (2301).
-#define D_byte(b) {*chptr++=(char)b; ++sloc; ++ch_size; if(orgactive) ++orgaddr;}
-#define D_word(w) {chcheck(2);*chptr++=(char)(w>>8); *chptr++=(char)w; \
- sloc+=2; ch_size+=2; if(orgactive) orgaddr += 2;}
-#define D_long(lw) {*chptr++=(char)(lw>>24); *chptr++=(char)(lw>>16);\
- *chptr++=(char)(lw>>8); *chptr++=(char)lw; \
- sloc+=4; ch_size += 4; if(orgactive) orgaddr += 4;}
-#define D_rword(w) {*chptr++=(char)w; *chptr++=(char)(w>>8); \
- sloc+=2; ch_size+=2;if(orgactive) orgaddr += 2;}
-#define D_rlong(lw) {*chptr++=(char)(lw>>16);*chptr++=(char)(lw>>24);\
- *chptr++=(char)lw;*chptr++=(char)(lw>>8); \
- sloc+=4; ch_size += 4;if(orgactive) orgaddr += 4;}
-
-#define NSECTS 16 // Max. number of sections
+#define D_byte(b) {*chptr++=(uint8_t)(b); sloc++; ch_size++; \
+ if(orgactive) orgaddr++;}
+#define D_word(w) {chcheck(2);*chptr++=(uint8_t)((w)>>8); \
+ *chptr++=(uint8_t)(w); \
+ sloc += 2; ch_size += 2; if(orgactive) orgaddr += 2;}
+#define D_long(lw) {*chptr++=(uint8_t)((lw)>>24); \
+ *chptr++=(uint8_t)((lw)>>16);\
+ *chptr++=(uint8_t)((lw)>>8); \
+ *chptr++=(uint8_t)(lw); \
+ sloc += 4; ch_size += 4; if(orgactive) orgaddr += 4;}
+#define D_quad(qw) {*chptr++=(uint8_t)((qw)>>56); \
+ *chptr++=(uint8_t)((qw)>>48);\
+ *chptr++=(uint8_t)((qw)>>40);\
+ *chptr++=(uint8_t)((qw)>>32);\
+ *chptr++=(uint8_t)((qw)>>24);\
+ *chptr++=(uint8_t)((qw)>>16);\
+ *chptr++=(uint8_t)((qw)>>8); \
+ *chptr++=(uint8_t)(qw); \
+ sloc += 8; ch_size += 8; if(orgactive) orgaddr += 8;}
+#define D_rword(w) {*chptr++=(uint8_t)(w); *chptr++=(uint8_t)((w)>>8); \
+ sloc+=2; ch_size+=2;if(orgactive) orgaddr += 2;}
+#define D_single(w) {chcheck(4);*chptr++ = ((char *)&w)[3]; \
+ *chptr++ = ((char *)&w)[2]; \
+ *chptr++ = ((char *)&w)[1]; \
+ *chptr++=((char *)&w)[0]; \
+ sloc+=4; ch_size += 4; if(orgactive) orgaddr += 4;}
+#define D_double(w) {chcheck(8);*chptr++=(char)((*(unsigned long long *)&w)); \
+ *chptr++=(char)((*(unsigned long long *)&w)>>8); \
+ *chptr++=(char)((*(unsigned long long *)&w)>>16); \
+ *chptr++=(char)((*(unsigned long long *)&w)>>24); \
+ *chptr++=(char)((*(unsigned long long *)&w)>>32); \
+ *chptr++=(char)((*(unsigned long long *)&w)>>40); \
+ *chptr++=(char)((*(unsigned long long *)&w)>>48); \
+ *chptr++=(char)((*(unsigned long long *)&w)>>56); \
+ sloc+=8; ch_size += 8; if(orgactive) orgaddr += 8;}
+#ifdef _MSC_VER
+#define D_extend(w) {chcheck(12); *chptr++ = (char)((*(unsigned long long *)&w) >> 56); \
+*chptr++ = (char)(((*(unsigned long long *)&w) >> (52)) & 0xf); \
+*chptr++ = (char)(0); \
+*chptr++ = (char)(0); \
+*chptr++ = (char)(((*(unsigned long long *)&w) >> (48 - 3))|0x80 /* assume that the number is normalised */); \
+*chptr++ = (char)((*(unsigned long long *)&w) >> (40 - 3)); \
+*chptr++ = (char)((*(unsigned long long *)&w) >> (32 - 3)); \
+*chptr++ = (char)((*(unsigned long long *)&w) >> (24 - 3)); \
+*chptr++ = (char)((*(unsigned long long *)&w) >> (16 - 3)); \
+*chptr++ = (char)((*(unsigned long long *)&w) >> (8 - 3)); \
+*chptr++ = (char)((*(unsigned long long *)&w << 3)); \
+*chptr++=(char)(0); \
+ sloc+=12; ch_size += 12; if(orgactive) orgaddr += 12;}
+#elif defined(LITTLE_ENDIAN)
+#define D_extend(w) {chcheck(12);*chptr++=((char *)&w)[0]; \
+ *chptr++=((char *)&w)[1]; \
+ *chptr++=((char *)&w)[2]; \
+ *chptr++=((char *)&w)[3]; \
+ *chptr++=((char *)&w)[4]; \
+ *chptr++=((char *)&w)[5]; \
+ *chptr++=((char *)&w)[6]; \
+ *chptr++=((char *)&w)[7]; \
+ *chptr++=((char *)&w)[8]; \
+ *chptr++=((char *)&w)[9]; \
+ *chptr++=((char *)&w)[10]; \
+ *chptr++=((char *)&w)[11]; \
+ sloc+=12; ch_size += 12; if(orgactive) orgaddr += 12;}
+
+#else
+
+#error Please implement a non-byte swapped D_extend!
+
+#endif
+// Fill n bytes with zeroes
+#define D_ZEROFILL(n) {memset(chptr, 0, n); chptr+=n; sloc+=n; ch_size+=n;\
+ if (orgactive) orgaddr+=n;}
+
+#define NSECTS 16 // Max. number of sections