mirror of
https://github.com/xomboverlord/ldc.git
synced 2026-03-02 02:23:13 +01:00
Fix warnings on x86-64. By fvbommel.
This commit is contained in:
@@ -280,7 +280,7 @@ extern(C) _Unwind_Reason_Code _d_eh_personality(int ver, _Unwind_Action actions,
|
||||
|
||||
// get classinfo for action and check if the one in the
|
||||
// exception structure is a base
|
||||
ClassInfo catch_ci = classinfo_table[-ti_offset];
|
||||
ClassInfo catch_ci = *(classinfo_table - ti_offset);
|
||||
debug(EH_personality) printf("Comparing catch %s to exception %s\n", catch_ci.name.ptr, exception_struct.exception_object.classinfo.name.ptr);
|
||||
if(_d_isbaseof(exception_struct.exception_object.classinfo, catch_ci))
|
||||
return _d_eh_install_catch_context(actions, ti_offset, landing_pad, exception_struct, context);
|
||||
@@ -320,7 +320,7 @@ private _Unwind_Reason_Code _d_eh_install_catch_context(_Unwind_Action actions,
|
||||
{
|
||||
debug(EH_personality) printf("Setting switch value to: %d!\n", switchval);
|
||||
_Unwind_SetGR(context, eh_exception_regno, cast(ulong)cast(void*)(exception_struct.exception_object));
|
||||
_Unwind_SetGR(context, eh_selector_regno, switchval);
|
||||
_Unwind_SetGR(context, eh_selector_regno, cast(ulong)switchval);
|
||||
_Unwind_SetIP(context, landing_pad);
|
||||
return _Unwind_Reason_Code.INSTALL_CONTEXT;
|
||||
}
|
||||
|
||||
@@ -263,7 +263,7 @@ void initStaticDataPtrs()
|
||||
// TODO: Exclude zero-mapped regions
|
||||
|
||||
int fd = open("/proc/self/maps", O_RDONLY);
|
||||
int count; // %% need to configure ret for read..
|
||||
ptrdiff_t count; // %% need to configure ret for read..
|
||||
char buf[2024];
|
||||
char* p;
|
||||
char* e;
|
||||
@@ -338,7 +338,7 @@ void initStaticDataPtrs()
|
||||
else
|
||||
{
|
||||
count = p - s;
|
||||
memmove(buf.ptr, s, count);
|
||||
memmove(buf.ptr, s, cast(size_t)count);
|
||||
p = buf.ptr + count;
|
||||
break;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user