D/xomb-bare-bones
1
0
Fork 0
mirror of https://github.com/xomboverlord/xomb-bare-bones.git synced 2026-01-11 18:33:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed for new LDC and Tango stubs.

Browse Source 
Signed-off-by: The XOmB Overlord <overlord@xomb.net>
This commit is contained in:
wilkie
2009-05-22 13:07:57 +08:00
committed by The XOmB Overlord
parent 96579c17a8
commit 5f08273316
2 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
kernel/runtime/dstubs.d
View File

@@ -519,25 +519,25 @@ void _d_switch_error( char[] file, uint line )
private void onAssertError(char[] file, size_t line)
{
kprintfln!("Error in {}, line {}: assertion failed.")(file, "line");
kprintfln!("Error in {}, line {}: assertion failed.")(file, line);
asm { l: hlt; jmp l; }
}
private void onAssertErrorMsg(char[] file, size_t line, char[] msg)
{
kprintfln!("Error in {}, line {}: assertion failed: \"{}\"")(file, "line", msg);
kprintfln!("Error in {}, line {}: assertion failed: \"{}\"")(file, line, msg);
asm { l: hlt; jmp l; }
}
private void onArrayBoundsError(char[] file, size_t line)
{
kprintfln!("Error in {}, line {}: array index out of bounds.")(file, "line");
kprintfln!("Error in {}, line {}: array index out of bounds.")(file, line);
asm { l: hlt; jmp l; }
}
private void onSwitchError(char[] file, size_t line)
{
kprintfln!("Error in {}, line {}: switch has no case or default to handle the switched-upon value.")(file, "line");
kprintfln!("Error in {}, line {}: switch has no case or default to handle the switched-upon value.")(file, line);
asm { l: hlt; jmp l; }
}
@@ -1025,7 +1025,7 @@ Array _adSort(Array a, TypeInfo ti)
do
ri -= elem_size;
while (ti.compare(ri, lbound) > 0);
if (li > ri)
if (li > ri)
break;
ti.swap(li, ri);
}
@@ -1075,7 +1075,7 @@ void[] _d_arraycast(size_t tsize, size_t fsize, void[] a)
auto nbytes = length * fsize;
if(nbytes % tsize != 0)
throw new Exception("array cast misalignment");
assert (0, "array cast misalignment");
length = nbytes / tsize;
*cast(size_t *)&a = length; // jam new length
@@ -1085,15 +1085,25 @@ void[] _d_arraycast(size_t tsize, size_t fsize, void[] a)
byte[] _d_arraycopy(size_t size, byte[] from, byte[] to)
{
if(to.length != from.length)
throw new Exception("lengths don't match for array copy");
assert (0, "lengths don't match for array copy");
else if(cast(byte *)to + to.length * size <= cast(byte *)from || cast(byte *)from + from.length * size <= cast(byte *)to)
memcpy(cast(byte *)to, cast(byte *)from, to.length * size);
else
throw new Exception("overlapping array copy");
assert (0, "overlapping array copy");
return to;
}
void _d_array_slice_copy(void* dst, size_t dstlen, void* src, size_t srclen)
{
if (dstlen != srclen)
assert(0, "lengths don't match for array copy");
else if (dst+dstlen <=src || src+srclen <= dst)
memcpy(dst, src, dstlen);
else
assert(0, "overlapping array copy");
}
mixin(Stub!("Object _d_allocclass(ClassInfo ci)"));
mixin(Stub!("void _d_throw_exception(Object e)"));

1
kernel/runtime/object.d
View File

@@ -279,6 +279,7 @@ class ClassInfo : Object
void *deallocator;
OffsetTypeInfo[] offTi;
void* defaultConstructor; // default Constructor
TypeInfo typeinfo;
/*************
* Search all modules for ClassInfo corresponding to classname.