Skip to content

Commit ae64d6a

Browse files
jhuber6jhuber6
committed
[libc] Initial support for 'locale.h' in the LLVM libc
Summary: This patch adds the macros and entrypoints associated with the `locale.h` entrypoints. These are mostly stubs, as we (for now and the forseeable future) only expect to support the C and maybe C.UTF-8 locales in the LLVM libc.
1 parent 80c51fa commit ae64d6a

35 files changed

+788
-0
lines changed

‎libc/config/gpu/entrypoints.txt

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -231,6 +231,15 @@ set(TARGET_LIBC_ENTRYPOINTS
231231
# wchar.h entrypoints
232232
libc.src.wchar.wctob
233233

234+
# locale.h entrypoints
235+
libc.src.locale.localeconv
236+
libc.src.locale.duplocale
237+
libc.src.locale.freelocale
238+
libc.src.locale.localeconv
239+
libc.src.locale.newlocale
240+
libc.src.locale.setlocale
241+
libc.src.locale.uselocale
242+
234243
# gpu/rpc.h entrypoints
235244
libc.src.gpu.rpc_host_call
236245
)

‎libc/config/gpu/headers.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ set(TARGET_PUBLIC_HEADERS
1616
libc.include.wchar
1717
libc.include.uchar
1818
libc.include.features
19+
libc.include.locale
1920

2021
# Header for RPC extensions
2122
libc.include.gpu_rpc

‎libc/config/linux/x86_64/entrypoints.txt

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -982,6 +982,15 @@ if(LLVM_LIBC_FULL_BUILD)
982982
libc.src.time.nanosleep
983983
libc.src.time.time
984984

985+
# locale.h entrypoints
986+
libc.src.locale.localeconv
987+
libc.src.locale.duplocale
988+
libc.src.locale.freelocale
989+
libc.src.locale.localeconv
990+
libc.src.locale.newlocale
991+
libc.src.locale.setlocale
992+
libc.src.locale.uselocale
993+
985994
# unistd.h entrypoints
986995
libc.src.unistd.__llvm_libc_syscall
987996
libc.src.unistd._exit

‎libc/config/linux/x86_64/headers.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ set(TARGET_PUBLIC_HEADERS
3333
libc.include.unistd
3434
libc.include.wchar
3535
libc.include.uchar
36+
libc.include.locale
3637

3738
libc.include.arpa_inet
3839

‎libc/hdr/types/CMakeLists.txt

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,3 +162,12 @@ add_proxy_header_library(
162162
libc.include.llvm-libc-types.cookie_io_functions_t
163163
libc.include.stdio
164164
)
165+
166+
add_proxy_header_library(
167+
locale_t
168+
HDRS
169+
locale_t.h
170+
FULL_BUILD_DEPENDS
171+
libc.include.llvm-libc-types.locale_t
172+
libc.include.locale
173+
)

‎libc/hdr/types/locale_t.h

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
//===-- Definition of macros from locale_t.h ------------------------------===//
2+
//
3+
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4+
// See https://llvm.org/LICENSE.txt for license information.
5+
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6+
//
7+
//===----------------------------------------------------------------------===//
8+
9+
#ifndef LLVM_LIBC_HDR_LOCALE_T_H
10+
#define LLVM_LIBC_HDR_LOCALE_T_H
11+
12+
#ifdef LIBC_FULL_BUILD
13+
14+
#include "include/llvm-libc-types/locale_t.h"
15+
16+
#else // overlay mode
17+
18+
#error "type not available in overlay mode"
19+
20+
#endif // LLVM_LIBC_FULL_BUILD
21+
22+
#endif // LLVM_LIBC_HDR_LOCALE_T_H

‎libc/include/CMakeLists.txt

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -717,6 +717,18 @@ add_header_macro(
717717
.llvm-libc-types.wchar_t
718718
)
719719

720+
add_header_macro(
721+
locale
722+
../libc/newhdrgen/yaml/locale.yaml
723+
locale.h.def
724+
locale.h
725+
DEPENDS
726+
.llvm_libc_common_h
727+
.llvm-libc-macros.locale_macros
728+
.llvm-libc-types.locale_t
729+
.llvm-libc-types.struct_lconv
730+
)
731+
720732
if(LIBC_TARGET_OS_IS_GPU)
721733
file(MAKE_DIRECTORY ${LIBC_INCLUDE_DIR}/gpu)
722734

‎libc/include/llvm-libc-macros/CMakeLists.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -295,3 +295,9 @@ add_macro_header(
295295
HDR
296296
elf-macros.h
297297
)
298+
299+
add_macro_header(
300+
locale_macros
301+
HDR
302+
locale-macros.h
303+
)

‎libc/include/llvm-libc-macros/locale-macros.h

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
//===-- Definition of macros from locale.h --------------------------------===//
2+
//
3+
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4+
// See https://llvm.org/LICENSE.txt for license information.
5+
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6+
//
7+
//===----------------------------------------------------------------------===//
8+
9+
#ifndef LLVM_LIBC_MACROS_LOCALE_MACROS_H
10+
#define LLVM_LIBC_MACROS_LOCALE_MACROS_H
11+
12+
#include "../llvm-libc-types/locale_t.h"
13+
14+
#define LC_CTYPE 0
15+
#define LC_NUMERIC 1
16+
#define LC_TIME 2
17+
#define LC_COLLATE 3
18+
#define LC_MONETARY 4
19+
#define LC_MESSAGES 5
20+
#define LC_ALL 6
21+
22+
#define LC_GLOBAL_LOCALE ((locale_t)(-1))
23+
24+
#define LC_CTYPE_MASK (1 << LC_CTYPE)
25+
#define LC_NUMERIC_MASK (1 << LC_NUMERIC)
26+
#define LC_TIME_MASK (1 << LC_TIME)
27+
#define LC_COLLATE_MASK (1 << LC_COLLATE)
28+
#define LC_MONETARY_MASK (1 << LC_MONETARY)
29+
#define LC_MESSAGES_MASK (1 << LC_MESSAGES)
30+
#define LC_ALL_MASK 0x7fffffff
31+
32+
#endif // LLVM_LIBC_MACROS_LOCALE_MACROS_H

‎libc/include/llvm-libc-types/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,3 +142,5 @@ DEPENDS
142142
.fsblkcnt_t
143143
.fsfilcnt_t
144144
)
145+
add_header(locale_t HDR locale_t.h)
146+
add_header(struct_lconv HDR struct_lconv.h)

‎libc/include/llvm-libc-types/locale_t.h

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
//===-- Definition of type locale_t ---------------------------------------===//
2+
//
3+
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4+
// See https://llvm.org/LICENSE.txt for license information.
5+
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6+
//
7+
//===----------------------------------------------------------------------===//
8+
9+
#ifndef LLVM_LIBC_TYPES_LOCALE_T_H
10+
#define LLVM_LIBC_TYPES_LOCALE_T_H
11+
12+
#define NUM_LOCALE_CATEGORIES 6
13+
14+
struct __locale_data;
15+
16+
struct __locale_t {
17+
struct __locale_data *data[NUM_LOCALE_CATEGORIES];
18+
};
19+
20+
typedef struct __locale_t *locale_t;
21+
22+
#endif // LLVM_LIBC_TYPES_LOCALE_T_H

‎libc/include/llvm-libc-types/struct_lconv.h

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
//===-- Definition of type lconv ------------------------------------------===//
2+
//
3+
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4+
// See https://llvm.org/LICENSE.txt for license information.
5+
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6+
//
7+
//===----------------------------------------------------------------------===//
8+
9+
#ifndef LLVM_LIBC_TYPES_LCONV_H
10+
#define LLVM_LIBC_TYPES_LCONV_H
11+
12+
struct lconv {
13+
char *decimal_point;
14+
char *thousands_sep;
15+
char *grouping;
16+
char *mon_decimal_point;
17+
char *mon_thousands_sep;
18+
char *mon_grouping;
19+
char *positive_sign;
20+
char *negative_sign;
21+
char *currency_symbol;
22+
char frac_digits;
23+
char p_cs_precedes;
24+
char n_cs_precedes;
25+
char p_sep_by_space;
26+
char n_sep_by_space;
27+
char p_sign_posn;
28+
char n_sign_posn;
29+
char *int_curr_symbol;
30+
char int_frac_digits;
31+
char int_p_cs_precedes;
32+
char int_n_cs_precedes;
33+
char int_p_sep_by_space;
34+
char int_n_sep_by_space;
35+
char int_p_sign_posn;
36+
char int_n_sign_posn;
37+
};
38+
39+
#endif // LLVM_LIBC_TYPES_LCONV_H

‎libc/include/locale.h.def

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
//===-- C standard library header locale.h --------------------------------===//
2+
//
3+
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4+
// See https://llvm.org/LICENSE.txt for license information.
5+
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6+
//
7+
//===----------------------------------------------------------------------===//
8+
9+
#ifndef LLVM_LIBC_LOCALE_H
10+
#define LLVM_LIBC_LOCALE_H
11+
12+
#include "__llvm-libc-common.h"
13+
14+
#include "llvm-libc-macros/locale-macros.h"
15+
#include "llvm-libc-types/locale_t.h"
16+
#include "llvm-libc-types/struct_lconv.h"
17+
18+
%%public_api()
19+
20+
#endif // LLVM_LIBC_LOCALE_H

‎libc/newhdrgen/yaml/locale.yaml

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
header: locale.h
2+
functions:
3+
- name: localeconv
4+
standards:
5+
- stdc
6+
return_type: struct lconv *
7+
arguments:
8+
- type: void
9+
- name: duplocale
10+
standards:
11+
- stdc
12+
return_type: locale_t
13+
arguments:
14+
- type: locale_t
15+
- name: freelocale
16+
standards:
17+
- stdc
18+
return_type: void
19+
arguments:
20+
- type: locale_t
21+
- name: newlocale
22+
standards:
23+
- stdc
24+
return_type: locale_t
25+
arguments:
26+
- type: int
27+
- type: const char *
28+
- type: locale_t
29+
- name: setlocale
30+
standards:
31+
- stdc
32+
return_type: char *
33+
arguments:
34+
- type: int
35+
- type: const char *
36+
- name: uselocale
37+
standards:
38+
- stdc
39+
return_type: locale_t
40+
arguments:
41+
- type: locale_t

‎libc/spec/stdc.td

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ def StdC : StandardSpec<"stdc"> {
44
PtrType StructTmPtr = PtrType<StructTmType>;
55
PtrType TimeTTypePtr = PtrType<TimeTType>;
66
NamedType ClockT = NamedType<"clock_t">;
7+
NamedType LocaleT = NamedType<"locale_t">;
78

89
NamedType DivTType = NamedType<"div_t">;
910
NamedType LDivTType = NamedType<"ldiv_t">;
@@ -1588,6 +1589,61 @@ def StdC : StandardSpec<"stdc"> {
15881589
]
15891590
>;
15901591

1592+
1593+
NamedType StructLconv : NamedType<"struct lconv">;
1594+
PtrType StructLconvPtr : PtrType<StructLconv>;
1595+
1596+
HeaderSpec Locale = HeaderSpec<
1597+
"locale.h",
1598+
[], // Macros
1599+
[LocaleT, StructLconv], // Types
1600+
[], // Enumerations
1601+
[
1602+
FunctionSpec<
1603+
"duplocale",
1604+
RetValSpec<LocaleT>,
1605+
[
1606+
ArgSpec<LocaleT>
1607+
]
1608+
>,
1609+
FunctionSpec<
1610+
"freelocale",
1611+
RetValSpec<VoidType>,
1612+
[
1613+
ArgSpec<LocaleT>
1614+
]
1615+
>,
1616+
FunctionSpec<
1617+
"localeconv",
1618+
RetValSpec<StructLconvPtr>,
1619+
[]
1620+
>,
1621+
FunctionSpec<
1622+
"newlocale",
1623+
RetValSpec<LocaleT>,
1624+
[
1625+
ArgSpec<IntType>,
1626+
ArgSpec<ConstCharPtr>,
1627+
ArgSpec<LocaleT>
1628+
]
1629+
>,
1630+
FunctionSpec<
1631+
"setlocale",
1632+
RetValSpec<CharPtr>,
1633+
[
1634+
ArgSpec<IntType>,
1635+
ArgSpec<ConstCharPtr>
1636+
]
1637+
>,
1638+
FunctionSpec<
1639+
"uselocale",
1640+
RetValSpec<LocaleT>,
1641+
[
1642+
ArgSpec<LocaleT>
1643+
]
1644+
>
1645+
] // Functions
1646+
>;
15911647

15921648
let Headers = [
15931649
Assert,
@@ -1610,5 +1666,6 @@ def StdC : StandardSpec<"stdc"> {
16101666
Time,
16111667
UChar,
16121668
WChar,
1669+
Locale,
16131670
];
16141671
}

‎libc/src/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,3 +40,4 @@ add_subdirectory(signal)
4040
add_subdirectory(spawn)
4141
add_subdirectory(threads)
4242
add_subdirectory(time)
43+
add_subdirectory(locale)

0 commit comments

Comments
 (0)