Skip to content

Commit 9cc1105

Browse files
committed
make targ_size_t 64 bits for SPP and HTOD
1 parent 9415cd2 commit 9cc1105

File tree

2 files changed

+6
-24
lines changed

2 files changed

+6
-24
lines changed

dm/src/dmc/cdef.d

Lines changed: 4 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -286,28 +286,10 @@ enum
286286
enum REGMASK = 0xFFFF;
287287

288288
// targ_llong is also used to store host pointers, so it should have at least their size
289-
version (SCPP)
290-
{
291-
// 64 bit support
292-
alias targ_ptrdiff_t = int64_t; // ptrdiff_t for target machine
293-
alias targ_size_t = uint64_t; // size_t for the target machine
294-
}
295-
else version (SPP)
296-
{
297-
alias targ_ptrdiff_t = targ_int; // ptrdiff_t for target machine
298-
alias targ_size_t = targ_uns; // size_t for the target machine
299-
}
300-
else version (HTOD)
301-
{
302-
alias targ_ptrdiff_t = targ_int; // ptrdiff_t for target machine
303-
alias targ_size_t = targ_uns; // size_t for the target machine
304-
}
305-
else
306-
{
307-
// Support 64 bit targets
308-
alias targ_ptrdiff_t = int64_t; // ptrdiff_t for target machine
309-
alias targ_size_t = uint64_t; // size_t for the target machine
310-
}
289+
290+
// 64 bit support
291+
alias targ_ptrdiff_t = int64_t; // ptrdiff_t for target machine
292+
alias targ_size_t = uint64_t; // size_t for the target machine
311293

312294
/* Enable/disable various features
313295
(Some features may no longer work the old way when compiled out,

dm/src/dmc/htod.d

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -424,7 +424,7 @@ void htod_struct(Classsym *s)
424424
switch (sf.Sclass)
425425
{
426426
case SCmember:
427-
memoff = sf.Smemoff;
427+
memoff = cast(uint)sf.Smemoff;
428428
htod_indent(indent + 4);
429429
fprintf(fdmodule, "%s%s;\n", pt, &sf.Sident[0]);
430430
break;
@@ -435,7 +435,7 @@ void htod_struct(Classsym *s)
435435
sprintf(bf.ptr, "__bitfield%d", ++bitfieldn);
436436
htod_indent(indent + 4);
437437
fprintf(fdmodule, "%s%s;\n", pt, bf.ptr);
438-
memoff = sf.Smemoff;
438+
memoff = cast(uint)sf.Smemoff;
439439
}
440440
// Swidth, Sbit
441441
m = (cast(targ_ullong)1 << sf.Swidth) - 1;

0 commit comments

Comments
 (0)