Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libroot: Replace a64l/l64a with musl equivalents.

Browse Source
This commit is contained in:
Augustin Cavalier 2022-03-09 15:50:30 -05:00
parent 92ca4f66a7
commit 3a76add7d3
6 changed files with 46 additions and 126 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/system/libroot/posix/glibc/stdlib/Jamfile
View File

@ -19,7 +19,6 @@ for architectureObject in [ MultiArchSubDirSetup ] {
UsePrivateHeaders libroot ;
MergeObject <$(architecture)>posix_gnu_stdlib.o :
a64l.c
drand48.c
drand48_r.c
drand48-iter.c
@ -29,7 +28,6 @@ for architectureObject in [ MultiArchSubDirSetup ] {
jrand48.c
jrand48_r.c
inlines.c
l64a.c
lcong48.c
lcong48_r.c
lrand48.c

66
src/system/libroot/posix/glibc/stdlib/a64l.c
View File

@ -1,66 +0,0 @@
/* Copyright (C) 1995-2014 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@gnu.org>, August 1995.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
The GNU C Library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
#include <stdlib.h>
#define TABLE_BASE 0x2e
#define TABLE_SIZE 0x4d
#define XX ((char)0x40)
static const char a64l_table[TABLE_SIZE] =
{
/* 0x2e */ 0, 1,
/* 0x30 */ 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, XX, XX, XX, XX, XX, XX,
/* 0x40 */ XX, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26,
/* 0x50 */ 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, XX, XX, XX, XX, XX,
/* 0x60 */ XX, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52,
/* 0x70 */ 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63
};
long int
a64l (string)
const char *string;
{
const char *ptr = string;
unsigned long int result = 0ul;
const char *end = ptr + 6;
int shift = 0;
do
{
unsigned index;
unsigned value;
index = *ptr - TABLE_BASE;
if ((unsigned int) index >= TABLE_SIZE)
break;
value = (int) a64l_table[index];
if (value == (int) XX)
break;
++ptr;
result |= value << shift;
shift += 6;
}
while (ptr != end);
return (long int) result;
}

58
src/system/libroot/posix/glibc/stdlib/l64a.c
View File

@ -1,58 +0,0 @@
/* Copyright (C) 1995-2014 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, August 1995.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
The GNU C Library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
#include <stdlib.h>
/* Conversion table. */
static const char conv_table[64] =
{
'.', '/', '0', '1', '2', '3', '4', '5',
'6', '7', '8', '9', 'A', 'B', 'C', 'D',
'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L',
'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T',
'U', 'V', 'W', 'X', 'Y', 'Z', 'a', 'b',
'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j',
'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r',
's', 't', 'u', 'v', 'w', 'x', 'y', 'z'
};
char *
l64a (n)
long int n;
{
unsigned long int m = (unsigned long int) n;
static char result[7];
int cnt;
/* The standard says that only 32 bits are used. */
m &= 0xffffffff;
if (m == 0ul)
/* The value for N == 0 is defined to be the empty string. */
return (char *) "";
for (cnt = 0; m > 0ul; ++cnt)
{
result[cnt] = conv_table[m & 0x3f];
m >>= 6;
}
result[cnt] = '\0';
return result;
}

2
src/system/libroot/posix/musl/Jamfile
View File

@ -8,6 +8,7 @@ for architectureObject in [ MultiArchSubDirSetup ] {
MergeObjectFromObjects <$(architecture)>posix_musl.o :
:
<$(architecture)>posix_musl_math.o
<$(architecture)>posix_musl_misc.o
<$(architecture)>posix_musl_regex.o
<$(architecture)>posix_musl_search.o
<$(architecture)>posix_musl_string.o
@ -20,6 +21,7 @@ for arch in $(TARGET_ARCHS) {
HaikuSubInclude math $(arch) ;
}
HaikuSubInclude misc ;
HaikuSubInclude regex ;
HaikuSubInclude search ;
HaikuSubInclude string ;

15
src/system/libroot/posix/musl/misc/Jamfile Normal file
View File

@ -0,0 +1,15 @@
SubDir HAIKU_TOP src system libroot posix musl misc ;
SubDirSysHdrs [ FDirName $(SUBDIR) .. include ] ;
UseHeaders [ FDirName $(SUBDIR) .. internal ] ;
local architectureObject ;
for architectureObject in [ MultiArchSubDirSetup ] {
on $(architectureObject) {
local architecture = $(TARGET_PACKAGING_ARCH) ;
MergeObject <$(architecture)>posix_musl_misc.o :
a64l.c
;
}
}

29
src/system/libroot/posix/musl/misc/a64l.c Normal file
View File

@ -0,0 +1,29 @@
#include <stdlib.h>
#include <string.h>
#include <stdint.h>
static const char digits[] =
"./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
long a64l(const char *s)
{
int e;
uint32_t x = 0;
for (e=0; e<36 && *s; e+=6, s++) {
const char *d = strchr(digits, *s);
if (!d) break;
x |= (uint32_t)(d-digits)<<e;
}
return (int32_t)x;
}
char *l64a(long x0)
{
static char s[7];
char *p;
uint32_t x = x0;
for (p=s; x; p++, x>>=6)
*p = digits[x&63];
*p = 0;
return s;
}