[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[cinvoke-svn] r97 - in trunk/cinvoke: . bindings/java lib lib/arch test
|
From: |
will |
|
Subject: |
[cinvoke-svn] r97 - in trunk/cinvoke: . bindings/java lib lib/arch test |
|
Date: |
24 Jul 2006 18:01:49 -0400 |
Author: will
Date: 2006-07-24 18:01:48 -0400 (Mon, 24 Jul 2006)
New Revision: 97
Added:
trunk/cinvoke/lib/arch/gcc_sparc_unix.c
trunk/cinvoke/lib/arch/gcc_sparc_unix.h
Modified:
trunk/cinvoke/bindings/java/org_cinvoke_Natives.cpp
trunk/cinvoke/configure.pl
trunk/cinvoke/lib/arch/gcc_ppc_osx.c
trunk/cinvoke/lib/arch/gcc_ppc_osx.h
trunk/cinvoke/lib/cinvoke-arch.h
trunk/cinvoke/test/runtests.c
Log:
a little sparc code, passes some tests
Modified: trunk/cinvoke/bindings/java/org_cinvoke_Natives.cpp
===================================================================
--- trunk/cinvoke/bindings/java/org_cinvoke_Natives.cpp 2006-07-15 20:09:05 UTC
(rev 96)
+++ trunk/cinvoke/bindings/java/org_cinvoke_Natives.cpp 2006-07-24 22:01:48 UTC
(rev 97)
@@ -36,7 +36,7 @@
#define T_JINT -2
#define T_JLONG -3
-#ifdef __APPLE_CC__
+#if __APPLE_CC__ || __sun__
#define TO_PTR(jl) ((void *)(int)(jl))
#define TO_LONG(p) ((jlong)(int)(p))
#else
@@ -495,7 +495,8 @@
"([Ljava/lang/Object;)Ljava/lang/Object;");
if (!meth) return;
- jobjectArray parr = env->NewObjectArray(numparms, objcls, NULL);
+ jobjectArray parr = (jobjectArray)env->NewObjectArray(numparms,
+ objcls, NULL);
if (!parr) return;
for (int i = 0; i < numparms; i++) {
env->SetObjectArrayElement(parr, i,
Modified: trunk/cinvoke/configure.pl
===================================================================
--- trunk/cinvoke/configure.pl 2006-07-15 20:09:05 UTC (rev 96)
+++ trunk/cinvoke/configure.pl 2006-07-24 22:01:48 UTC (rev 97)
@@ -7,6 +7,8 @@
parse_args();
+my $LINUX = 0;
+
my $platform = determine_platform();
print "Using platform '$platform'\n";
@@ -24,7 +26,7 @@
my $LIBDL;
# Linux and OSX have libdl, *BSD doesn't
-if ((-f '/lib/libdl.so.2') || $platform =~ m/_OSX$/) {
+if ($LINUX || $platform =~ m/_OSX$/) {
$LIBDL = '-ldl';
} else {
$LIBDL = '';
@@ -36,18 +38,18 @@
$JNIINCLUDE = '-I/System/Library/Frameworks/JavaVM.framework/Headers';
$BUILDSHARED = 'libtool -dynamic -lc -o';
$CXXBUILDSHARED = 'g++ -dynamiclib -o';
+ $DYNCFLAGS = '-dynamic';
$BUILDSTATIC = 'libtool -static -o';
$RANLIB = 'echo';
- $DYNCFLAGS = '-dynamic';
} else {
$DYNEXT = 'so';
$JNIDYNEXT = 'so';
$JNIINCLUDE = '';
$BUILDSHARED = 'gcc -shared -o';
$CXXBUILDSHARED = 'g++ -shared -o';
+ $DYNCFLAGS = '-fPIC';
$BUILDSTATIC = 'rm -f $(TARGET) && ar rs';
$RANLIB = 'ranlib';
- $DYNCFLAGS = '-fPIC';
}
my $ARCH_SOURCE = $ARCH_HEADER;
@@ -73,6 +75,8 @@
$processor = 'X64';
} elsif ($gccout =~ m/ppc/) {
$processor = 'PPC';
+ } elsif ($gccout =~ m/sparc/) {
+ $processor = 'SPARC';
} else {
die "unrecognized architecture $gccout";
}
@@ -85,6 +89,11 @@
$os = "OSX";
} else {
$os = "UNIX"; # hey why not
+
+ # specific unices
+ if ($uname =~ m/Linux/) {
+ $LINUX = 1;
+ }
}
return $processor . '_' . $os;
Modified: trunk/cinvoke/lib/arch/gcc_ppc_osx.c
===================================================================
--- trunk/cinvoke/lib/arch/gcc_ppc_osx.c 2006-07-15 20:09:05 UTC (rev 96)
+++ trunk/cinvoke/lib/arch/gcc_ppc_osx.c 2006-07-24 22:01:48 UTC (rev 97)
@@ -335,20 +335,20 @@
}
void arch_getval_char(ArchRetValue *archval, char *outval) {
- *outval = archval->ivallo;
+ *outval = archval->ivalhi;
}
void arch_getval_short(ArchRetValue *archval, short *outval) {
- *outval = archval->ivallo;
+ *outval = archval->ivalhi;
}
void arch_getval_int(ArchRetValue *archval, int *outval) {
- *outval = archval->ivallo;
+ *outval = archval->ivalhi;
}
void arch_getval_long(ArchRetValue *archval, long int *outval) {
- *outval = archval->ivallo;
+ *outval = archval->ivalhi;
}
void arch_getval_extralong(ArchRetValue *archval, long long int *outval) {
- *outval = archval->ivalhi;
- *outval |= (((long long)archval->ivallo) << 32);
+ *outval = archval->ivallo;
+ *outval |= (((long long)archval->ivalhi) << 32);
}
void arch_getval_float(ArchRetValue *archval, float *outval) {
*outval = archval->dval;
@@ -357,24 +357,24 @@
*outval = archval->dval;
}
void arch_getval_ptr(ArchRetValue *archval, void **outval) {
- *outval = (void *)archval->ivallo;
+ *outval = (void *)archval->ivalhi;
}
void arch_setval_char(ArchRetValue *archval, char val) {
- archval->ivallo = val;
+ archval->ivalhi = val;
}
void arch_setval_short(ArchRetValue *archval, short val) {
- archval->ivallo = val;
+ archval->ivalhi = val;
}
void arch_setval_int(ArchRetValue *archval, int val) {
- archval->ivallo = val;
+ archval->ivalhi = val;
}
void arch_setval_long(ArchRetValue *archval, long int val) {
- archval->ivallo = val;
+ archval->ivalhi = val;
}
void arch_setval_extralong(ArchRetValue *archval, long long int val) {
- archval->ivalhi = (val & 0xFFFFFFFF);
- archval->ivallo = val >> 32;
+ archval->ivallo = (val & 0xFFFFFFFF);
+ archval->ivalhi = val >> 32;
}
void arch_setval_float(ArchRetValue *archval, float val) {
archval->dval = val;
@@ -383,7 +383,7 @@
archval->dval = val;
}
void arch_setval_ptr(ArchRetValue *archval, void *val) {
- archval->ivallo = (int)val;
+ archval->ivalhi = (int)val;
}
void arch_size_char(int *stacksize_out, int *structsize_out,
Modified: trunk/cinvoke/lib/arch/gcc_ppc_osx.h
===================================================================
--- trunk/cinvoke/lib/arch/gcc_ppc_osx.h 2006-07-15 20:09:05 UTC (rev 96)
+++ trunk/cinvoke/lib/arch/gcc_ppc_osx.h 2006-07-24 22:01:48 UTC (rev 97)
@@ -184,16 +184,16 @@
__asm__("stw r3, %0\n \
stw r4, %1\n \
stfd f1, %2\n" : \
+ "=m" ((archvalue).ivalhi), \
"=m" ((archvalue).ivallo), \
- "=m" ((archvalue).ivalhi), \
"=m" ((archvalue).dval));
#define ARCH_SET_RETURN(archvalue) \
__asm__("lwz r3, %0\n \
lwz r4, %1\n \
lfd f1, %2\n" :: \
+ "m" ((archvalue).ivalhi), \
"m" ((archvalue).ivallo), \
- "m" ((archvalue).ivalhi), \
"m" ((archvalue).dval) : \
"r3", "r4", "f1");
#define ARCH_PUT_STACK_BYTES(bcount) \
Added: trunk/cinvoke/lib/arch/gcc_sparc_unix.c
===================================================================
--- trunk/cinvoke/lib/arch/gcc_sparc_unix.c (rev 0)
+++ trunk/cinvoke/lib/arch/gcc_sparc_unix.c 2006-07-24 22:01:48 UTC (rev 97)
@@ -0,0 +1,444 @@
+/*
+C/Invoke Source Code File
+
+Copyright (c) 2006 Will Weisser
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+this list of conditions and the following disclaimer in the documentation
+and/or other materials provided with the distribution.
+ 3. The name of the author may not be used to endorse or promote products
+derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+*/
+#ifdef CINVOKE_BUILD
+#include "../cinvoke.h"
+#include "../cinvoke-private.h"
+#else
+#include "cinvoke.h"
+#include "cinvoke-private.h"
+#endif
+
+#include <dlfcn.h>
+#include <errno.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <sys/mman.h>
+#include <unistd.h>
+
+void arch_free_errstr(char *str) {
+ free(str);
+}
+
+cinv_status_t arch_library_create(CInvContext *context, const char *path,
+ ArchLibrary *library_out) {
+ void *dl = dlopen(path, RTLD_LAZY);
+ if (!dl) {
+ context_set_error(context, -1, strdup(dlerror()), 1);
+ return CINV_ERROR;
+ }
+
+ library_out->dl = dl;
+
+ return CINV_SUCCESS;
+}
+cinv_status_t arch_library_get_entrypoint(CInvContext *context,
+ ArchLibrary *library, const char *name, void **entrypoint_out) {
+ void *sym = dlsym(library->dl, name);
+ if (!sym) {
+ context_set_error(context, -1, strdup(dlerror()), 1);
+ return CINV_ERROR;
+ }
+
+ *entrypoint_out = sym;
+
+ return CINV_SUCCESS;
+}
+cinv_status_t arch_library_delete(CInvContext *context, ArchLibrary *library) {
+ if (dlclose(library->dl)) {
+ context_set_error(context, -1, strdup(dlerror()), 1);
+ return CINV_ERROR;
+ }
+
+ return CINV_SUCCESS;
+}
+
+// XXX
+/*
+int isflt(cinv_type_t t) {
+ return (t == CINV_T_FLOAT) || (t == CINV_T_DOUBLE);
+}
+
+const static int LEN = 4096;
+*/
+// XXX
+char *arch_callback_stub(void *functionp, void *param,
+ short stacksize, cinv_callconv_t cc, cinv_type_t types[], int
numparams) {
+/* short functionphi = ((int)functionp >> 16);
+ short functionplo = ((int)functionp & 0xFFFF);
+ short paramhi = ((int)param >> 16);
+ short paramlo = ((int)param & 0xFFFF);
+
+ int needscopy = 0, i, numints = 0;
+
+ for (i = 0; i < numparams; i++) {
+ if (isflt(types[i])) {
+ if (types[i] == CINV_T_FLOAT)
+ numints++;
+ else
+ numints += 2;
+ } else {
+ if (types[i] == CINV_T_EXTRALONG)
+ numints += 2;
+ else
+ numints ++;
+ }
+
+ if (numints == 9 && types[i] == CINV_T_EXTRALONG) {
+ needscopy = 1;
+ break;
+ }
+ }
+
+ char *ret = mmap(0, LEN, PROT_EXEC|PROT_READ|PROT_WRITE,
+ MAP_ANON|MAP_PRIVATE, -1, 0);
+ if (ret == MAP_FAILED)
+ return NULL;
+
+ if (!needscopy) {
+ //void f() {
+ // __asm("mr r2, r3" ::: "r2");
+ // ((void (*)(void *))0xAAAABBBB)((void *)0xCCCCDDDD);
+ //}
+ memcpy(ret,
+ "\x7c\x08\x02\xa6\xbf\xc1\xff\xf8"
+ "\x90\x01\x00\x08\x94\x21\xff\xb0"
+ "\x7c\x3e\x0b\x78\x7c\x62\x1b\x78"
+ "\x3c\x00\xaa\xaa\x60\x00\xbb\xbb"
+ "\x3c\x60\xcc\xcc\x60\x63\xdd\xdd"
+ "\x7c\x0c\x03\x78\x7d\x89\x03\xa6"
+ "\x4e\x80\x04\x21\x80\x21\x00\x00"
+ "\x80\x01\x00\x08\x7c\x08\x03\xa6"
+ "\xbb\xc1\xff\xf8\x4e\x80\x00\x20",
+ 72);
+
+ memcpy(ret + 26, &functionphi, 2);
+ memcpy(ret + 30, &functionplo, 2);
+ memcpy(ret + 34, ¶mhi, 2);
+ memcpy(ret + 38, ¶mlo, 2);
+ } else {
+ short offset = 80 + ARCH_STACK_SKIPTOP + (7 * 4);
+ offset &= 0x7FF;
+
+ //void f2() {
+ // __asm("lwz r10 3822(r1)"); // 0xEEE
+ // __asm("mr r2, r3" ::: "r2");
+ // ((void (*)(void *))0xAAAABBBB)((void *)0xCCCCDDDD);
+ //}
+ memcpy(ret,
+ "\x7c\x08\x02\xa6\xbf\xc1\xff\xf8"
+ "\x90\x01\x00\x08\x94\x21\xff\xb0"
+ "\x7c\x3e\x0b\x78\x91\x41\x0e\xee"
+ "\x7c\x62\x1b\x78\x3c\x00\xaa\xaa"
+ "\x60\x00\xbb\xbb\x3c\x60\xcc\xcc"
+ "\x60\x63\xdd\xdd\x7c\x0c\x03\x78"
+ "\x7d\x89\x03\xa6\x4e\x80\x04\x21"
+ "\x80\x21\x00\x00\x80\x01\x00\x08"
+ "\x7c\x08\x03\xa6\xbb\xc1\xff\xf8"
+ "\x4e\x80\x00\x20",
+ 76);
+
+ memcpy(ret + 22, &offset, 2);
+ memcpy(ret + 30, &functionphi, 2);
+ memcpy(ret + 34, &functionplo, 2);
+ memcpy(ret + 38, ¶mhi, 2);
+ memcpy(ret + 42, ¶mlo, 2);
+ }
+
+ // the following block is a ppc oddity which is neccessary due to
+ // the instruction cache and data cache not being linked. in
+ // order to modify and execute code on ppc we have to flush it out
+ // of the data cache, then invalidate the instruction cache. this
+ // will ensure that when the code is executed it is running our fresh
+ // copy from memory. Much praise to H D Moore for pointing this out @
+ // http://www.uninformed.org/?v=1&a=1&t=pdf.
+ int *c = (int *)ret;
+ for (i = 0; i < 76; i++) {
+ __asm("lwz r2, %0" :: "m" (c) : "r2");
+ __asm("dcbf 0, r2");
+ __asm("sync");
+ __asm("icbi 0, r2");
+ __asm("isync");
+ c++;
+ }
+
+
+ return ret; */
+ return NULL;
+}
+// XXX
+void arch_free_stub(char *stub) {
+/* munmap(stub, LEN);*/
+}
+
+// XXX
+int arch_is_register_parm(cinv_callconv_t callingconvention, int index,
+ int num_params, cinv_type_t types[]) {
+/* int numints = 0, numflts = 0;
+ int i;
+ for (i = 0; i <= index; i++) {
+ if (isflt(types[i])) {
+ numflts++;
+ if (types[i] == CINV_T_FLOAT)
+ numints++;
+ else
+ numints += 2;
+ } else if (types[i] == CINV_T_EXTRALONG)
+ numints += 2;
+ else
+ numints++;
+ }
+ return (isflt(types[index]) && numflts <= 13) || (numints <= 8); */
+ return 1;
+}
+/*void set_flt(ArchRegParms *regparms, int index, void *p, cinv_type_t type) {
+ double *toset[] = {
+ &(regparms->f1), &(regparms->f2), &(regparms->f3),
+ &(regparms->f4), &(regparms->f5), &(regparms->f6),
+ &(regparms->f7), &(regparms->f8), &(regparms->f9),
+ &(regparms->f10), &(regparms->f11), &(regparms->f12),
+ &(regparms->f13)
+ };
+
+ if (type == CINV_T_FLOAT)
+ *toset[index] = *(float *)p;
+ else
+ *toset[index] = *(double *)p;
+}
+void set_int(ArchRegParms *regparms, int index, void *p, cinv_type_t type) {
+ int *toset[] = {
+ &(regparms->r3), &(regparms->r4), &(regparms->r5),
+ &(regparms->r6), &(regparms->r7), &(regparms->r8),
+ &(regparms->r9), &(regparms->r10)
+ };
+
+ if (type == CINV_T_CHAR)
+ *(toset[index]) = *(char *)p;
+ else if (type == CINV_T_SHORT)
+ *(toset[index]) = *(short *)p;
+ else if (type == CINV_T_INT)
+ *(toset[index]) = *(int *)p;
+ else if (type == CINV_T_LONG)
+ *(toset[index]) = (int)*(long *)p;
+ else if (type == CINV_T_EXTRALONG) {
+ *(toset[index]) = (int)((*(long long *)p) >> 32);
+ if (index < 7)
+ *(toset[index + 1]) = (int)((*(long long *)p) &
0xFFFFFFFF);
+ } else
+ *(toset[index]) = (int)*(void **)p;
+}*/
+
+// XXX
+void arch_set_register_parms(ArchRegParms *regparms,
+ cinv_callconv_t callingconvention, int num_params, void *parameters[],
+ cinv_type_t types[]) {
+ /*int numints = 0, numflts = 0;
+ int i;
+ for (i = 0; i < num_params; i++) {
+ if (isflt(types[i])) {
+ if (numflts < 13)
+ set_flt(regparms, numflts, parameters[i],
types[i]);
+ numflts++;
+ if (types[i] == CINV_T_FLOAT)
+ numints++;
+ else
+ numints += 2;
+ } else {
+ if (numints < 8)
+ set_int(regparms, numints, parameters[i],
types[i]);
+ if (types[i] == CINV_T_EXTRALONG)
+ numints += 2;
+ else
+ numints++;
+ }
+ }*/
+}
+/*
+void get_flt(void *po, int index, ArchRegParms *regparms, cinv_type_t type) {
+ double *toget[] = {
+ &(regparms->f1), &(regparms->f2), &(regparms->f3),
+ &(regparms->f4), &(regparms->f5), &(regparms->f6),
+ &(regparms->f7), &(regparms->f8), &(regparms->f9),
+ &(regparms->f10), &(regparms->f11), &(regparms->f12),
+ &(regparms->f13)
+ };
+
+ if (type == CINV_T_FLOAT)
+ *(float *)po = *toget[index];
+ else
+ *(double *)po = *toget[index];
+}
+void get_int(void *po, int index, ArchRegParms *regparms, cinv_type_t type) {
+ int *toget[] = {
+ &(regparms->r3), &(regparms->r4), &(regparms->r5),
+ &(regparms->r6), &(regparms->r7), &(regparms->r8),
+ &(regparms->r9), &(regparms->r10)
+ };
+
+ if (type == CINV_T_CHAR)
+ *(char *)po = *toget[index];
+ else if (type == CINV_T_SHORT)
+ *(short *)po = *toget[index];
+ else if (type == CINV_T_INT)
+ *(int *)po = *toget[index];
+ else if (type == CINV_T_LONG)
+ *(long *)po = *toget[index];
+ else if (type == CINV_T_EXTRALONG) {
+ if (index < 7) {
+ *(long long *)po = ((long long)*toget[index]) << 32;
+ *(long long *)po |= *toget[index + 1];
+ }
+ } else
+ *(void* *)po = (void *)*toget[index];
+}*/
+
+// XXX
+void arch_get_register_parms(ArchRegParms *regparms,
+ cinv_callconv_t callingconvention, int num_params, void
*parameters_out[],
+ cinv_type_t types[]) {
+/* int numints = 0, numflts = 0;
+ int i;
+ for (i = 0; i < num_params; i++) {
+ if (isflt(types[i])) {
+ if (numflts < 13)
+ get_flt(parameters_out[i], numflts, regparms,
types[i]);
+ numflts++;
+ if (types[i] == CINV_T_FLOAT)
+ numints++;
+ else
+ numints += 2;
+ } else {
+ if (numints < 8)
+ get_int(parameters_out[i], numints, regparms,
types[i]);
+ if (types[i] == CINV_T_EXTRALONG)
+ numints += 2;
+ else
+ numints++;
+ }
+ }*/
+}
+
+void arch_getval_char(ArchRetValue *archval, char *outval) {
+ *outval = archval->ivalhi;
+}
+void arch_getval_short(ArchRetValue *archval, short *outval) {
+ *outval = archval->ivalhi;
+}
+void arch_getval_int(ArchRetValue *archval, int *outval) {
+ *outval = archval->ivalhi;
+}
+void arch_getval_long(ArchRetValue *archval, long int *outval) {
+ *outval = archval->ivalhi;
+}
+void arch_getval_extralong(ArchRetValue *archval, long long int *outval) {
+ *outval = archval->ivallo;
+ *outval |= (((long long)archval->ivalhi) << 32);
+}
+void arch_getval_float(ArchRetValue *archval, float *outval) {
+ *outval = *(float *)&archval->dval;
+}
+void arch_getval_double(ArchRetValue *archval, double *outval) {
+ *outval = archval->dval;
+}
+void arch_getval_ptr(ArchRetValue *archval, void **outval) {
+ *outval = (void *)archval->ivalhi;
+}
+
+void arch_setval_char(ArchRetValue *archval, char val) {
+ archval->ivalhi = val;
+}
+void arch_setval_short(ArchRetValue *archval, short val) {
+ archval->ivalhi = val;
+}
+void arch_setval_int(ArchRetValue *archval, int val) {
+ archval->ivalhi = val;
+}
+void arch_setval_long(ArchRetValue *archval, long int val) {
+ archval->ivalhi = val;
+}
+void arch_setval_extralong(ArchRetValue *archval, long long int val) {
+ archval->ivallo = (val & 0xFFFFFFFF);
+ archval->ivalhi = val >> 32;
+}
+void arch_setval_float(ArchRetValue *archval, float val) {
+ archval->dval = *(double *)&val;
+}
+void arch_setval_double(ArchRetValue *archval, double val) {
+ archval->dval = val;
+}
+void arch_setval_ptr(ArchRetValue *archval, void *val) {
+ archval->ivalhi = (int)val;
+}
+
+void arch_size_char(int *stacksize_out, int *structsize_out,
+ int *structalign_out) {
+ *stacksize_out = 4;
+ *structsize_out = 1;
+}
+void arch_size_short(int *stacksize_out, int *structsize_out,
+ int *structalign_out) {
+ *stacksize_out = 4;
+ *structsize_out = 2;
+ *structalign_out = 2;
+}
+void arch_size_int(int *stacksize_out, int *structsize_out,
+ int *structalign_out) {
+ *stacksize_out = 4;
+ *structsize_out = 4;
+ *structalign_out = 4;
+}
+void arch_size_long(int *stacksize_out, int *structsize_out,
+ int *structalign_out) {
+ *stacksize_out = 4;
+ *structsize_out = 4;
+ *structalign_out = 4;
+}
+void arch_size_extralong(int *stacksize_out, int *structsize_out,
+ int *structalign_out) {
+ *stacksize_out = 8;
+ *structsize_out = 8;
+ *structalign_out = 4;
+}
+void arch_size_float(int *stacksize_out, int *structsize_out,
+ int *structalign_out) {
+ *stacksize_out = 4;
+ *structsize_out = 4;
+ *structalign_out = 4;
+}
+void arch_size_double(int *stacksize_out, int *structsize_out,
+ int *structalign_out) {
+ *stacksize_out = 8;
+ *structsize_out = 8;
+ *structalign_out = 8;
+}
+void arch_size_ptr(int *stacksize_out, int *structsize_out,
+ int *structalign_out) {
+ *stacksize_out = 4;
+ *structsize_out = 4;
+ *structalign_out = 4;
+}
Added: trunk/cinvoke/lib/arch/gcc_sparc_unix.h
===================================================================
--- trunk/cinvoke/lib/arch/gcc_sparc_unix.h (rev 0)
+++ trunk/cinvoke/lib/arch/gcc_sparc_unix.h 2006-07-24 22:01:48 UTC (rev 97)
@@ -0,0 +1,162 @@
+/*
+C/Invoke Source Code File
+
+Copyright (c) 2006 Will Weisser
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+this list of conditions and the following disclaimer in the documentation
+and/or other materials provided with the distribution.
+ 3. The name of the author may not be used to endorse or promote products
+derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+*/
+#ifndef _ARCH_GCC_SPARC_UNIX_H
+#define _ARCH_GCC_SPARC_UNIX_H
+
+#include <errno.h>
+
+typedef struct _ArchLibrary {
+ void *dl;
+} ArchLibrary;
+
+typedef struct _ArchRetValue {
+ int ivallo;
+ int ivalhi;
+ double dval;
+} ArchRetValue;
+
+typedef struct _ArchRegParms {
+ int io0;
+ int io1;
+ int io2;
+ int io3;
+ int io4;
+ int io5;
+} ArchRegParms;
+
+typedef char cinv_int8_t;
+typedef short cinv_int16_t;
+typedef int cinv_int32_t;
+typedef long long cinv_int64_t;
+
+#define CINV_E_NOMEM ((cinv_int32_t)ENOMEM)
+#define CINV_S_NOMEM (strerror(ENOMEM))
+#define CINV_NOMEM_NEEDSFREE 0
+#define CINV_E_INVAL ((cinv_int32_t)EINVAL)
+
+#define CINV_CC_DEFAULT CINV_CC_CDECL
+#define CINV_T_2BYTE CINV_T_SHORT
+#define CINV_T_4BYTE CINV_T_INT
+#define CINV_T_8BYTE CINV_T_EXTRALONG
+
+/////////////////////////////////////
+// macros
+/////////////////////////////////////
+#define ARCH_SAVE_REGPARMS(regparms) \
+ __asm__("st %%g5, %0\n \
+ st %%i1, %1\n \
+ st %%i2, %2\n \
+ st %%i3, %3\n \
+ st %%i4, %4\n \
+ st %%i5, %5\n" : \
+ "=m" ((regparms).io0), \
+ "=m" ((regparms).io1), \
+ "=m" ((regparms).io2), \
+ "=m" ((regparms).io3), \
+ "=m" ((regparms).io4), \
+ "=m" ((regparms).io5));
+
+#define ARCH_CALL(regparms, ep) \
+ __asm__("ld %0, %%o0\n \
+ ld %1, %%o1\n \
+ ld %2, %%o2\n \
+ ld %3, %%o3\n \
+ ld %4, %%o4\n \
+ ld %5, %%o5\n \
+ ld %6, %%g1\n \
+ call %%g1, 0\n \
+ nop\n" :: \
+ "m" ((regparms).io0), \
+ "m" ((regparms).io1), \
+ "m" ((regparms).io2), \
+ "m" ((regparms).io3), \
+ "m" ((regparms).io4), \
+ "m" ((regparms).io5), \
+ "m" (ep) : \
+ "%o0", "%o1", "%o2", "%o3", \
+ "%o4", "%o5", \
+ "%g1");
+
+#define ARCH_SAVE_RETURN(archvalue) \
+ __asm__("st %%o0, %0\n \
+ st %%o1, %1\n \
+ std %%f0, %2\n" : \
+ "=m" ((archvalue).ivalhi), \
+ "=m" ((archvalue).ivallo), \
+ "=m" ((archvalue).dval));
+
+#define ARCH_SET_RETURN(archvalue) \
+ __asm__("ld %0, %%i0\n \
+ ld %1, %%i1\n \
+ ld %2, %%f0\n \
+ ld %3, %%f1\n" :: \
+ "m" ((archvalue).ivalhi), \
+ "m" ((archvalue).ivallo), \
+ "m" ((archvalue).dval), \
+ "m" (*(&(archvalue).dval + 4)) : \
+ "%i0", "%i1", "%f0", "%f1");
+
+// XXX jiggle these numbers
+#define ARCH_PUT_STACK_BYTES(bcount) \
+{ \
+ int bc = bcount + ARCH_STACK_SKIPTOP; \
+ if (bc <= 32) \
+ __asm__("save %%sp, -32, %%sp" ::: "%sp"); \
+ else if (bc <= 48) \
+ __asm__("save %%sp, -48, %%sp" ::: "%sp"); \
+ else if (bc <= 64) \
+ __asm__("save %%sp, -64, %%sp" ::: "%sp"); \
+ else if (bc <= 128) \
+ __asm__("save %%sp, -128, %%sp" ::: "%sp"); \
+ else if (bc <= 256) \
+ __asm__("save %%sp, -256, %%sp" ::: "%sp"); \
+ else \
+ __asm__("save %%sp, -512, %%sp" ::: "%sp"); \
+}
+#define ARCH_REMOVE_STACK_BYTES(bcount) \
+ __asm__("restore" ::: "%sp");
+
+#define ARCH_GET_STACK(sp) \
+ __asm__("st %%sp, %0" : "=m" (sp));
+
+#define ARCH_GET_FRAME_PTR(fp) \
+ __asm__("st %%fp, %0" : "=m" (fp));
+
+#define ARCH_CALLBACK_ARG_OFFSET (392) // XXX
+
+#define ARCH_BIG_ENDIAN 1
+
+#define ARCH_STACK_GROWS_DOWN 1
+
+#define ARCH_STACK_SKIPTOP 24 // XXX ?
+
+#define ARCH_REGPARMS_IN_STACKSIZE 1
+
+#define ARCH_CLAMP_NONFIRST_STRUCTALIGN 0
+
+#endif
Modified: trunk/cinvoke/lib/cinvoke-arch.h
===================================================================
--- trunk/cinvoke/lib/cinvoke-arch.h 2006-07-15 20:09:05 UTC (rev 96)
+++ trunk/cinvoke/lib/cinvoke-arch.h 2006-07-24 22:01:48 UTC (rev 97)
@@ -79,6 +79,9 @@
#ifdef ARCH_GCC_PPC_OSX
#include "arch/gcc_ppc_osx.h"
#endif
+#ifdef ARCH_GCC_SPARC_UNIX
+#include "arch/gcc_sparc_unix.h"
+#endif
#ifndef CINVOKE_BUILD
#include "cinvoke-archspec.h"
#endif
Modified: trunk/cinvoke/test/runtests.c
===================================================================
--- trunk/cinvoke/test/runtests.c 2006-07-15 20:09:05 UTC (rev 96)
+++ trunk/cinvoke/test/runtests.c 2006-07-24 22:01:48 UTC (rev 97)
@@ -391,6 +391,13 @@
else \
failed++;
+#define SKIP_UPDATE0(test) \
+ printf("skipping %s\n", #test); \
+ failed++;
+#define SKIP_UPDATE(test, retsig, paramsig) \
+ printf("skipping %s\n", #test); \
+ failed++;
+
#ifdef _WIN32
#define LIBSUFFIX "dll"
#else
@@ -422,16 +429,16 @@
}
UPDATE(test1, "", "");
- UPDATE(test2, "i", "i");
+ SKIP_UPDATE(test2, "i", "i");
UPDATE(test3, "p", "");
UPDATE(test4, "f", "");
UPDATE(test5, "d", "");
- UPDATE(test6, "e", "iefdc");
+ SKIP_UPDATE(test6, "e", "iefdc");
UPDATE0(test7);
UPDATE0(test8);
- UPDATE(test9, "", "p");
- UPDATE(test10, "f", "isclliils");
- UPDATE(test11, "", "p");
+ SKIP_UPDATE(test9, "", "p");
+ SKIP_UPDATE(test10, "f", "isclliils");
+ SKIP_UPDATE(test11, "", "p");
if (!cinv_library_delete(ctx, lib)) {
fprintf(stderr, "Error deleting library: %s\n",
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [cinvoke-svn] r97 - in trunk/cinvoke: . bindings/java lib lib/arch test,
will <=