mirrors/cosmopolitan
1
0
Fork 0
mirror of https://github.com/jart/cosmopolitan.git synced 2025-07-03 01:38:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove bad defines from early days of project

Browse source 
These definitions were causing issues with building LLVM. It is possible
they also caused crashes we've seen with our MacOS ARM64 OpenMP support.
This commit is contained in:
Justine Tunney 2024-07-24 12:11:21 -07:00
parent f25fbbaaeb
commit 5dd7ddb9ea
No known key found for this signature in database
GPG key ID: BE714B4575D6E328
20 changed files with 568 additions and 140 deletions
Download patch file Download diff file Expand all files Collapse all files

13
dsp/core/core.h
View file

@ -9,14 +9,13 @@ int mulaw(int);
int unmulaw(int);
void *double2byte(long, const void *, double, double) vallocesque;
void *byte2double(long, const void *, double, double) vallocesque;
void *dct(float[restrict hasatleast 8][8], unsigned, float, float, float, float,
float);
void *dctjpeg(float[restrict hasatleast 8][8], unsigned);
void *dct(float[hasatleast 8][8], unsigned, float, float, float, float, float);
void *dctjpeg(float[hasatleast 8][8], unsigned);
double det3(const double[3][3]) nosideeffect;
void *inv3(double[restrict 3][3], const double[restrict 3][3], double);
void *matmul3(double[restrict 3][3], const double[3][3], const double[3][3]);
void *vmatmul3(double[restrict 3], const double[3], const double[3][3]);
void *matvmul3(double[restrict 3], const double[3][3], const double[3]);
void *inv3(double[3][3], const double[3][3], double);
void *matmul3(double[3][3], const double[3][3], const double[3][3]);
void *vmatmul3(double[3], const double[3], const double[3][3]);
void *matvmul3(double[3], const double[3][3], const double[3]);
double rgb2stdtv(double) pureconst;
double rgb2lintv(double) pureconst;
double rgb2stdpc(double, double) pureconst;

6
dsp/core/dct.c
View file

@ -65,8 +65,8 @@
*
* @cost ~100ns
*/
void *dct(float M[restrict hasatleast 8][8], unsigned stride, float c0,
float c1, float c2, float c3, float c4) {
void *dct(float M[hasatleast 8][8], unsigned stride, float c0, float c1,
float c2, float c3, float c4) {
unsigned y, x;
for (y = 0; y < stride * 8; y += stride) {
DCT(M[y][0], M[y][1], M[y][2], M[y][3], M[y][4], M[y][5], M[y][6], M[y][7],
@ -79,7 +79,7 @@ void *dct(float M[restrict hasatleast 8][8], unsigned stride, float c0,
return M;
}
void *dctjpeg(float M[restrict hasatleast 8][8], unsigned stride) {
void *dctjpeg(float M[hasatleast 8][8], unsigned stride) {
return dct(M, stride, .707106781f, .382683433f, .541196100f, 1.306562965f,
.707106781f);
}

2
dsp/core/inv3.c
View file

@ -30,7 +30,7 @@
* @define 𝐀⁻¹=𝐁 such that 𝐀×𝐁=𝐁×𝐀=𝐈ₙ
* @see det3()
*/
void *inv3(double B[restrict 3][3], const double A[restrict 3][3], double d) {
void *inv3(double B[3][3], const double A[3][3], double d) {
d = d ? 1 / d : NAN;
B[0][0] = (A[1][1] * A[2][2] - A[2][1] * A[1][2]) * d;
B[0][1] = (A[2][1] * A[0][2] - A[0][1] * A[2][2]) * d;

3
dsp/core/matmul3.c
View file

@ -22,8 +22,7 @@
/**
* Multiplies 3×3 matrices.
*/
void *matmul3(double R[restrict 3][3], const double A[3][3],
const double B[3][3]) {
void *matmul3(double R[3][3], const double A[3][3], const double B[3][3]) {
int i, j, k;
memset(R, 0, sizeof(double) * 3 * 3);
for (i = 0; i < 3; ++i) {

2
dsp/core/matvmul3.c
View file

@ -23,7 +23,7 @@
*
* @see vmatmul3() for noncommutative corollary
*/
void *matvmul3(double R[restrict 3], const double M[3][3], const double V[3]) {
void *matvmul3(double R[3], const double M[3][3], const double V[3]) {
R[0] = V[0] * M[0][0] + V[1] * M[0][1] + V[2] * M[0][2];
R[1] = V[0] * M[1][0] + V[1] * M[1][1] + V[2] * M[1][2];
R[2] = V[0] * M[2][0] + V[1] * M[2][1] + V[2] * M[2][2];

2
dsp/core/vmatmul3.c
View file

@ -23,7 +23,7 @@
*
* @see matvmul3() for noncommutative corollary
*/
void *vmatmul3(double R[restrict 3], const double V[3], const double M[3][3]) {
void *vmatmul3(double R[3], const double V[3], const double M[3][3]) {
R[0] = V[0] * M[0][0] + V[1] * M[1][0] + V[2] * M[2][0];
R[1] = V[0] * M[0][1] + V[1] * M[1][1] + V[2] * M[2][1];
R[2] = V[0] * M[0][2] + V[1] * M[1][2] + V[2] * M[2][2];

17
dsp/mpeg/macroblock.c
View file

@ -31,9 +31,8 @@
#include "dsp/mpeg/video.h"
#include "libc/log/check.h"
forceinline void plm_video_process_macroblock(plm_video_t *self,
uint8_t *restrict d,
uint8_t *restrict s, int motion_h,
forceinline void plm_video_process_macroblock(plm_video_t *self, uint8_t *d,
uint8_t *s, int motion_h,
int motion_v, bool interpolate,
unsigned BW) {
unsigned si, di, max_address;
@ -155,17 +154,17 @@ forceinline void plm_video_process_macroblock(plm_video_t *self,
}
}
void plm_video_process_macroblock_8(plm_video_t *self, uint8_t *restrict d,
uint8_t *restrict s, int motion_h,
int motion_v, bool interpolate) {
void plm_video_process_macroblock_8(plm_video_t *self, uint8_t *d, uint8_t *s,
int motion_h, int motion_v,
bool interpolate) {
DCHECK_ALIGNED(8, d);
DCHECK_ALIGNED(8, s);
plm_video_process_macroblock(self, d, s, motion_h, motion_v, interpolate, 8);
}
void plm_video_process_macroblock_16(plm_video_t *self, uint8_t *restrict d,
uint8_t *restrict s, int motion_h,
int motion_v, bool interpolate) {
void plm_video_process_macroblock_16(plm_video_t *self, uint8_t *d, uint8_t *s,
int motion_h, int motion_v,
bool interpolate) {
DCHECK_ALIGNED(16, d);
DCHECK_ALIGNED(16, s);
plm_video_process_macroblock(self, d, s, motion_h, motion_v, interpolate, 16);

8
dsp/mpeg/video.h
View file

@ -51,10 +51,10 @@ typedef struct plm_video_t {
int assume_no_b_frames;
} plm_video_t;
void plm_video_process_macroblock_8(plm_video_t *, uint8_t *restrict,
uint8_t *restrict, int, int, bool);
void plm_video_process_macroblock_16(plm_video_t *, uint8_t *restrict,
uint8_t *restrict, int, int, bool);
void plm_video_process_macroblock_8(plm_video_t *, uint8_t *, uint8_t *, int,
int, bool);
void plm_video_process_macroblock_16(plm_video_t *, uint8_t *, uint8_t *, int,
int, bool);
COSMOPOLITAN_C_END_
#endif /* COSMOPOLITAN_DSP_MPEG_VIDEO_H_ */

17
dsp/scale/gyarados.c
View file

@ -53,11 +53,11 @@ struct SamplingSolution {
static double ComputeWeight(double x) {
if (-1.5 < x && x < 1.5) {
if (-.5 < x && x < .5) {
return .75 - SQR(x);
return.75 - SQR(x);
} else if (x < 0) {
return .5 * SQR(x + 1.5);
return.5 * SQR(x + 1.5);
} else {
return .5 * SQR(x - 1.5);
return.5 * SQR(x - 1.5);
}
} else {
return 0;
@ -149,12 +149,11 @@ static int Sharpen(int ax, int bx, int cx) {
static void GyaradosImpl(long dyw, long dxw, int dst[dyw][dxw], long syw,
long sxw, const int src[syw][sxw], long dyn, long dxn,
long syn, long sxn, int tmp0[restrict dyn][sxn],
int tmp1[restrict dyn][sxn],
int tmp2[restrict dyn][dxn], long yfn, long xfn,
const short fyi[dyn][yfn], const short fyw[dyn][yfn],
const short fxi[dxn][xfn], const short fxw[dxn][xfn],
bool sharpen) {
long syn, long sxn, int tmp0[dyn][sxn],
int tmp1[dyn][sxn], int tmp2[dyn][dxn], long yfn,
long xfn, const short fyi[dyn][yfn],
const short fyw[dyn][yfn], const short fxi[dxn][xfn],
const short fxw[dxn][xfn], bool sharpen) {
long i;
int eax, dy, dx, sx;
for (sx = 0; sx < sxn; ++sx) {

6
dsp/scale/magikarp.c
View file

@ -106,9 +106,9 @@ void *Magkern2xY(long ys, long xs, unsigned char p[ys][xs], long yn, long xn) {
return p;
}
void *MagikarpY(long dys, long dxs, unsigned char d[restrict dys][dxs],
long sys, long sxs, const unsigned char s[sys][sxs], long yn,
long xn, const signed char K[8]) {
void *MagikarpY(long dys, long dxs, unsigned char d[dys][dxs], long sys,
long sxs, const unsigned char s[sys][sxs], long yn, long xn,
const signed char K[8]) {
long y, x;
for (y = 0; y < yn; ++y) {
for (x = 0; x < xn; ++x) {