projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move allM to MonadUtils
[ghc-hetmet.git]
/
rts
/
Adjustor.c
diff --git
a/rts/Adjustor.c
b/rts/Adjustor.c
index
03fb5d9
..
a4c6abe
100644
(file)
--- a/
rts/Adjustor.c
+++ b/
rts/Adjustor.c
@@
-42,9
+42,9
@@
Haskell side.
#include "RtsUtils.h"
#include <stdlib.h>
#include "RtsUtils.h"
#include <stdlib.h>
-#if defined(USE_LIBFFI)
+#if defined(USE_LIBFFI_FOR_ADJUSTORS)
-#include <ffi.h>
+#include "ffi.h"
#include <string.h>
void
#include <string.h>
void
@@
-73,6
+73,7
@@
static ffi_type * char_to_ffi_type(char c)
case 's': return &ffi_type_uint16;
case 'B': return &ffi_type_sint8;
case 'b': return &ffi_type_uint8;
case 's': return &ffi_type_uint16;
case 'B': return &ffi_type_sint8;
case 'b': return &ffi_type_uint8;
+ case 'p': return &ffi_type_pointer;
default: barf("char_to_ffi_type: unknown type '%c'", c);
}
}
default: barf("char_to_ffi_type: unknown type '%c'", c);
}
}
@@
-715,7
+716,7
@@
TODO: Depending on how much allocation overhead stgMallocBytes uses for
}
else
{
}
else
{
- if((t == 'l' || t == 'L' || t == 'd')
+ if(t == 'l' || t == 'L' || t == 'd')
{
if(src_offset % 8)
src_offset += 4;
{
if(src_offset % 8)
src_offset += 4;
@@
-1171,4
+1172,4
@@
if ( *(unsigned char*)ptr != 0xe8 ) {
freeExec(ptr);
}
freeExec(ptr);
}
-#endif // !USE_LIBFFI
+#endif // !USE_LIBFFI_FOR_ADJUSTORS