Skip to content

Add fallback C code for inline ASM code #855

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
uyjulian wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add fallback C code for inline ASM code #855

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions ee/draw/src/draw.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,7 +351,11 @@ unsigned char draw_log2(unsigned int x)

unsigned char res;

#ifdef _EE
__asm__ __volatile__ ("plzcw %0, %1\n\t" : "=r" (res) : "r" (x));
#else
res = __builtin_clrsb(x);
#endif

res = 31 - (res + 1);
res += (x > (unsigned int)(1<<res) ? 1 : 0);
Expand Down
4 changes: 4 additions & 0 deletions ee/elf-loader/src/elf.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ MEMORY {
*/

static void wipe_bramMem(void) {
#ifdef _EE
int i;
for (i = 0x00084000; i < 0x100000; i += 64) {
__asm__ __volatile__(
Expand All @@ -48,6 +49,9 @@ static void wipe_bramMem(void) {
"\tsq $0, 32(%0) \n"
"\tsq $0, 48(%0) \n" ::"r"(i));
}
#else
memset((void *)0x00084000, 0, 0x100000 - 0x00084000);
#endif
}

int LoadELFFromFileWithPartition(const char *filename, const char *partition, int argc, char *argv[]) {
Expand Down
4 changes: 4 additions & 0 deletions ee/elf-loader/src/loader/src/loader.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@
//--------------------------------------------------------------
static void wipeUserMem(void)
{
#ifdef _EE
int i;
for (i = 0x100000; i < GetMemorySize(); i += 64) {
__asm__ __volatile__(
Expand All @@ -68,6 +69,9 @@ static void wipeUserMem(void)
"\tsq $0, 32(%0) \n"
"\tsq $0, 48(%0) \n" ::"r"(i));
}
#else
memset((void *)0x100000, 0, GetMemorySize() - 0x100000);
#endif
}

//--------------------------------------------------------------
Expand Down
4 changes: 4 additions & 0 deletions ee/graph/src/graph_mode.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ static inline int __udelay(unsigned int usecs)

}

#ifdef _EE
__asm__ __volatile__ (
".set push\n\t"
".set noreorder\n\t"
Expand All @@ -106,6 +107,9 @@ static inline int __udelay(unsigned int usecs)
".set pop\n\t"
:"=r" (loops_total)
:"0" (loops_total), "r" (loops_end));
#else
for (; loops_total < loops_end; loops_total += 1);
#endif

return 0;

Expand Down
4 changes: 4 additions & 0 deletions ee/libgs/src/lowlevel.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,11 @@ static s8 twh(s16 val)
{
s8 res;

#ifdef _EE
__asm__ __volatile__ ("plzcw %0, %1\n": "=r" (res) : "r" (val));
#else
res = __builtin_clrsb(val);
#endif
res = 31 - (res + 1);
if(val > res)
res++;
Expand Down
75 changes: 60 additions & 15 deletions ee/libvux/src/vuhw.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@
*/

#include <libvux.h>
#ifndef _EE
#include <string.h>
#endif

void Vu0IdMatrix(VU_MATRIX *m)
{
Expand All @@ -17,6 +20,7 @@ void Vu0IdMatrix(VU_MATRIX *m)

void Vu0ResetMatrix(VU_MATRIX *m)
{
#ifdef _EE
__asm__ __volatile__(
#if __GNUC__ > 3
"vmr32.xyzw $vf18, $vf0 \n"
Expand All @@ -38,6 +42,13 @@ void Vu0ResetMatrix(VU_MATRIX *m)

: : "r"(m)
);
#else
memset(m, 0, sizeof(*m));
m->m[3][3] = 1.0f;
m->m[2][2] = 1.0f;
m->m[1][1] = 1.0f;
m->m[0][0] = 1.0f;
#endif
}

#if 0
Expand All @@ -61,6 +72,7 @@ void VuxRotMatrix(VU_MATRIX *m, VU_VECTOR *r)
void Vu0TransMatrix(VU_MATRIX *m, VU_VECTOR *t)
{

#ifdef _EE
__asm__ __volatile__ (
#if __GNUC__ > 3
"lqc2 $vf1, 0(%1) \n" // load 1 qword from 't' to vu's vf1
Expand All @@ -72,6 +84,9 @@ void Vu0TransMatrix(VU_MATRIX *m, VU_VECTOR *t)

: : "r" (m), "r" (t)
);
#else
*(VU_VECTOR *)(&m->m[3][0]) = *t;
#endif
}

void Vu0TransMatrixXYZ(VU_MATRIX *m,float x, float y, float z)
Expand All @@ -93,6 +108,7 @@ void Vu0TransMatrixXYZ(VU_MATRIX *m,float x, float y, float z)
void Vu0ScaleMatrix(VU_MATRIX *m, VU_VECTOR *s)
{

#ifdef _EE
__asm__ __volatile__ (
#if __GNUC__ > 3
"lqc2 $vf1, 0(%1) \n" // load 1 qword from 't' to vu's vf1
Expand Down Expand Up @@ -130,6 +146,11 @@ void Vu0ScaleMatrix(VU_MATRIX *m, VU_VECTOR *s)

: : "r" (m), "r" (s)
);
#else
m->m[0][0] *= s->x;
m->m[1][1] *= s->y;
m->m[2][2] *= s->z;
#endif

}

Expand All @@ -148,6 +169,7 @@ void Vu0ScaleMatrixXYZ(VU_MATRIX *m, float x, float y, float z)
void Vu0MulMatrix(VU_MATRIX *m0, VU_MATRIX *m1, VU_MATRIX *out)
{

#ifdef _EE
__asm__ __volatile__ (
#if __GNUC__ > 3
"lqc2 $vf1, 0x00(%0) \n"
Expand Down Expand Up @@ -210,6 +232,22 @@ void Vu0MulMatrix(VU_MATRIX *m0, VU_MATRIX *m1, VU_MATRIX *out)
#endif
: : "r" (m0), "r" (m1), "r" (out)
);
#else
memset(out, 0, sizeof(*out));
int i;
for (i = 0; i < 4; i += 1)
{
int j;
for (j = 0; j < 4; j += 1)
{
int k;
for (k = 0; k < 4; k += 1)
{
out->m[i][k] += m1->m[j][k] * m0->m[i][j];
}
}
}
#endif
}

void Vu0InverseMatrix(VU_MATRIX *in, VU_MATRIX *out)
Expand All @@ -220,13 +258,7 @@ void Vu0InverseMatrix(VU_MATRIX *in, VU_MATRIX *out)

void Vu0ApplyMatrix(VU_MATRIX *m, VU_VECTOR *v0, VU_VECTOR *out)
{
/*
out->x = m->m[0][0]*v0->x + m->m[1][0]*v0->y + m->m[2][0]*v0->z + m->m[3][0]*v0->w;
out->y = m->m[0][1]*v0->x + m->m[1][1]*v0->y + m->m[2][1]*v0->z + m->m[3][1]*v0->w;
out->z = m->m[0][2]*v0->x + m->m[1][2]*v0->y + m->m[2][2]*v0->z + m->m[3][2]*v0->w;
out->w = m->m[0][3]*v0->x + m->m[1][3]*v0->y + m->m[2][3]*v0->z + m->m[3][3]*v0->w;
*/

#ifdef _EE
__asm__ __volatile__(
#if __GNUC__ > 3
"lqc2 $vf20, 0x00(%1) \n"
Expand All @@ -253,17 +285,18 @@ void Vu0ApplyMatrix(VU_MATRIX *m, VU_VECTOR *v0, VU_VECTOR *out)
#endif
: : "r"(m), "r"(v0), "r"(out)
);
#else
out->x = m->m[0][0] * v0->x + m->m[1][0] * v0->y + m->m[2][0] * v0->z + m->m[3][0] * v0->w;
out->y = m->m[0][1] * v0->x + m->m[1][1] * v0->y + m->m[2][1] * v0->z + m->m[3][1] * v0->w;
out->z = m->m[0][2] * v0->x + m->m[1][2] * v0->y + m->m[2][2] * v0->z + m->m[3][2] * v0->w;
out->w = m->m[0][3] * v0->x + m->m[1][3] * v0->y + m->m[2][3] * v0->z + m->m[3][3] * v0->w;
#endif

}

void Vu0ApplyRotMatrix(VU_MATRIX *m, VU_VECTOR *v0, VU_VECTOR *out)
{
/*
out->x = m->m[0][0]*v0->x + m->m[1][0]*v0->y + m->m[2][0]*v0->z;
out->y = m->m[0][1]*v0->x + m->m[1][1]*v0->y + m->m[2][1]*v0->z;
out->z = m->m[0][2]*v0->x + m->m[1][2]*v0->y + m->m[2][2]*v0->z;
*/

#ifdef _EE
__asm__ __volatile__(
#if __GNUC__ > 3
"lqc2 $vf20, 0x00(%1) \n"
Expand All @@ -288,12 +321,19 @@ void Vu0ApplyRotMatrix(VU_MATRIX *m, VU_VECTOR *v0, VU_VECTOR *out)
#endif
: : "r"(m), "r"(v0), "r"(out)
);
#else
out->x = m->m[0][0] * v0->x + m->m[1][0] * v0->y + m->m[2][0] * v0->z;
out->y = m->m[0][1] * v0->x + m->m[1][1] * v0->y + m->m[2][1] * v0->z;
out->z = m->m[0][2] * v0->x + m->m[1][2] * v0->y + m->m[2][2] * v0->z;
out->w = 1.0f;
#endif

}

void Vu0CopyMatrix(VU_MATRIX *dest, VU_MATRIX *src)
{

#ifdef _EE
__asm__ __volatile__ (
#if __GNUC__ > 3
"lqc2 $vf1, 0(%1) \n" // load 1 qword from ee
Expand All @@ -319,14 +359,16 @@ void Vu0CopyMatrix(VU_MATRIX *dest, VU_MATRIX *src)

: : "r" (dest), "r" (src)
);
#else
*dest = *src;
#endif
}

float Vu0DotProduct(VU_VECTOR *v0, VU_VECTOR *v1)
{
float ret=0;

/* ret = (v0.x*v1.x + v0.y*v1.y + v0.z*v1.z);*/

#ifdef _EE
__asm__ __volatile__ (
#if __GNUC__ > 3
"lqc2 $vf1, 0(%1) \n" // load 1 qword from ee
Expand All @@ -351,6 +393,9 @@ float Vu0DotProduct(VU_VECTOR *v0, VU_VECTOR *v1)
#endif
: "=r" (ret) : "r" (v0), "r" (v1)
);
#else
ret = (v0->x * v1->x + v0->y * v1->y + v0->z * v1->z);
#endif

return ret;
}
Loading
Loading