Skip to content
This repository was archived by the owner on Dec 16, 2022. It is now read-only.

Commit c39f1e1

Browse files
JeffBezansonJeffBezanson
committed
reorg: introduce julia_internal.h, consolidate build options into options.h
reorganize julia.h
1 parent 21c4283 commit c39f1e1

25 files changed

+444
-405
lines changed

‎src/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ default: release
4646

4747
release debug: %: libjulia-%
4848

49-
HEADERS = julia.h $(wildcard support/*.h) $(LIBUV_INC)/uv.h
49+
HEADERS = julia.h julia_internal.h $(wildcard support/*.h) $(LIBUV_INC)/uv.h
5050

5151
%.o: %.c $(HEADERS)
5252
@$(call PRINT_CC, $(CC) $(CPPFLAGS) $(CFLAGS) $(SHIPFLAGS) -DNDEBUG -c $< -o $@)

‎src/alloc.c

+1-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@
66
#include <stdarg.h>
77
#include <assert.h>
88
#include "julia.h"
9-
#include "newobj_internal.h"
10-
#include "builtin_proto.h"
9+
#include "julia_internal.h"
1110

1211
jl_value_t *jl_true;
1312
jl_value_t *jl_false;

‎src/array.c

+4-3
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
#include <malloc.h>
99
#endif
1010
#include "julia.h"
11+
#include "julia_internal.h"
1112

1213
// array constructors ---------------------------------------------------------
1314

@@ -21,9 +22,6 @@ int jl_array_store_unboxed(jl_value_t *el_type)
2122
return store_unboxed(el_type);
2223
}
2324

24-
// at this size use malloc
25-
#define MALLOC_THRESH 1048576
26-
2725
#if defined(_P64) && defined(UINT128MAX)
2826
typedef __uint128_t wideint_t;
2927
#else
@@ -518,6 +516,9 @@ void jl_arrayunset(jl_array_t *a, size_t i)
518516
memset(ptail, 0, a->elsize);
519517
}
520518

519+
// at this size and bigger, allocate resized array data with malloc
520+
#define MALLOC_THRESH 1048576
521+
521522
// allocate buffer of newlen elements, placing old data at given offset (in #elts)
522523
static void array_resize_buffer(jl_array_t *a, size_t newlen, size_t oldlen, size_t offs)
523524
{

‎src/ast.c

+8-6
Original file line numberDiff line numberDiff line change
@@ -10,23 +10,19 @@
1010
#include <malloc.h>
1111
#endif
1212
#include "julia.h"
13+
#include "julia_internal.h"
1314
#include "flisp.h"
1415

1516
static uint8_t flisp_system_image[] = {
1617
#include "julia_flisp.boot.inc"
1718
};
1819

1920
extern fltype_t *iostreamtype;
20-
static fltype_t *jvtype;
21+
static fltype_t *jvtype=NULL;
2122

2223
static jl_value_t *scm_to_julia(value_t e, int expronly);
2324
static value_t julia_to_scm(jl_value_t *v);
2425

25-
DLLEXPORT void jl_lisp_prompt(void)
26-
{
27-
fl_applyn(1, symbol_value(symbol("__start")), fl_cons(FL_NIL,FL_NIL));
28-
}
29-
3026
value_t fl_defined_julia_global(value_t *args, uint32_t nargs)
3127
{
3228
// tells whether a var is defined in and *by* the current module
@@ -128,6 +124,12 @@ DLLEXPORT void jl_init_frontend(void)
128124
false_sym = symbol("false");
129125
}
130126

127+
DLLEXPORT void jl_lisp_prompt(void)
128+
{
129+
if (jvtype==NULL) jl_init_frontend();
130+
fl_applyn(1, symbol_value(symbol("__start")), fl_cons(FL_NIL,FL_NIL));
131+
}
132+
131133
static jl_sym_t *scmsym_to_julia(value_t s)
132134
{
133135
assert(issymbol(s));

‎src/builtin_proto.h

-5
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ JL_CALLABLE(jl_f_new_box);
88
JL_CALLABLE(jl_f_new_module);
99
JL_CALLABLE(jl_f_throw);
1010
JL_CALLABLE(jl_f_is);
11-
JL_CALLABLE(jl_f_no_function);
1211
JL_CALLABLE(jl_f_typeof);
1312
JL_CALLABLE(jl_f_subtype);
1413
JL_CALLABLE(jl_f_isa);
@@ -30,17 +29,13 @@ JL_CALLABLE(jl_f_arraysize);
3029
JL_CALLABLE(jl_f_instantiate_type);
3130
JL_CALLABLE(jl_f_convert_default);
3231
JL_CALLABLE(jl_f_convert_tuple);
33-
JL_CALLABLE(jl_trampoline);
3432
JL_CALLABLE(jl_f_new_type_constructor);
3533
JL_CALLABLE(jl_f_typevar);
3634
JL_CALLABLE(jl_f_union);
3735
JL_CALLABLE(jl_f_methodexists);
3836
JL_CALLABLE(jl_f_applicable);
3937
JL_CALLABLE(jl_f_invoke);
40-
JL_CALLABLE(jl_apply_generic);
41-
JL_CALLABLE(jl_unprotect_stack);
4238
JL_CALLABLE(jl_f_task);
4339
JL_CALLABLE(jl_f_yieldto);
44-
JL_CALLABLE(jl_f_ctor_trampoline);
4540

4641
#endif

‎src/builtins.c

+1-2
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
#endif
2626
#include <ctype.h>
2727
#include "julia.h"
28+
#include "julia_internal.h"
2829
#include "builtin_proto.h"
2930

3031
// exceptions -----------------------------------------------------------------
@@ -302,8 +303,6 @@ JL_CALLABLE(jl_f_apply)
302303
return result;
303304
}
304305

305-
#include "newobj_internal.h"
306-
307306
void jl_add_constructors(jl_datatype_t *t);
308307

309308
JL_CALLABLE(jl_f_kwcall)

‎src/codegen.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#include "platform.h"
22
#include "julia.h"
3+
#include "julia_internal.h"
34

45
/*
56
* We include <mathimf.h> here, because somewhere below <math.h> is included also.

‎src/dump.c

+1-2
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,8 @@
88
#include <malloc.h>
99
#endif
1010
#include "julia.h"
11+
#include "julia_internal.h"
1112
#include "builtin_proto.h"
12-
#include "newobj_internal.h"
13-
#include "jltypes_internal.h"
1413

1514
static htable_t ser_tag;
1615
static htable_t deser_tag;

‎src/gc.c

+1-16
Original file line numberDiff line numberDiff line change
@@ -7,22 +7,7 @@
77
#include <string.h>
88
#include <assert.h>
99
#include "julia.h"
10-
11-
// with MEMDEBUG, every object is allocated explicitly with malloc, and
12-
// filled with 0xbb before being freed.
13-
//#define MEMDEBUG
14-
15-
// MEMPROFILE prints pool summary statistics after every GC
16-
//#define MEMPROFILE
17-
18-
// GCTIME prints time taken by each phase of GC
19-
//#define GCTIME
20-
21-
// GC_FINAL_STATS prints total GC stats at exit
22-
// set in julia.h
23-
24-
// OBJPROFILE counts objects by type
25-
//#define OBJPROFILE
10+
#include "julia_internal.h"
2611

2712
#ifdef _P64
2813
#define GC_PAGE_SZ (1536*sizeof(void*))//bytes

‎src/gf.c

+1-11
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,7 @@
1313
#include <malloc.h>
1414
#endif
1515
#include "julia.h"
16-
#include "builtin_proto.h"
17-
18-
#define ENABLE_INFERENCE
19-
20-
// debugging options
21-
//#define TRACE_INFERENCE
22-
//#define JL_TRACE
23-
//#define JL_GF_PROFILE
16+
#include "julia_internal.h"
2417

2518
static jl_methtable_t *new_method_table(jl_sym_t *name)
2619
{
@@ -306,8 +299,6 @@ jl_lambda_info_t *jl_add_static_parameters(jl_lambda_info_t *l, jl_tuple_t *sp)
306299
return nli;
307300
}
308301

309-
JL_CALLABLE(jl_trampoline);
310-
311302
jl_function_t *jl_instantiate_method(jl_function_t *f, jl_tuple_t *sp)
312303
{
313304
if (f->linfo == NULL)
@@ -1614,7 +1605,6 @@ static jl_value_t *ml_matches(jl_methlist_t *ml, jl_value_t *type,
16141605
}
16151606

16161607
void jl_add_constructors(jl_datatype_t *t);
1617-
JL_CALLABLE(jl_f_ctor_trampoline);
16181608

16191609
// return a cell array of tuples, each describing a method match:
16201610
// {(t, spvals, li, cenv), ...}

‎src/init.c

+3-2
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
#endif
2626

2727
#include "julia.h"
28+
#include "julia_internal.h"
2829
#include <stdio.h>
2930

3031
#ifdef _OS_WINDOWS_
@@ -155,7 +156,7 @@ volatile sig_atomic_t jl_signal_pending = 0;
155156
volatile sig_atomic_t jl_defer_signal = 0;
156157

157158
#ifdef _OS_WINDOWS_
158-
void restore_signals()
159+
void restore_signals(void)
159160
{
160161
SetConsoleCtrlHandler(NULL, 0); //turn on ctrl-c handler
161162
}
@@ -313,7 +314,7 @@ EXCEPTION_DISPOSITION _seh_exception_handler(PEXCEPTION_RECORD ExceptionRecord,
313314

314315
#else // #ifdef _OS_WINDOWS_
315316

316-
void restore_signals()
317+
void restore_signals(void)
317318
{
318319
sigset_t sset;
319320
sigemptyset(&sset);

‎src/interpreter.c

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
#include <malloc.h>
66
#endif
77
#include "julia.h"
8+
#include "julia_internal.h"
89
#include "builtin_proto.h"
910

1011
extern int jl_lineno;

‎src/jl_uv.c

+8
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
#endif
2626

2727
#include "julia.h"
28+
#include "julia_internal.h"
2829
#include "support/ios.h"
2930
#include "uv.h"
3031

@@ -35,6 +36,13 @@ extern "C" {
3536

3637
/** libuv callbacks */
3738

39+
enum CALLBACK_TYPE { CB_PTR, CB_INT32, CB_INT64 };
40+
#ifdef _P64
41+
#define CB_INT CB_INT64
42+
#else
43+
#define CB_INT CB_INT32
44+
#endif
45+
3846
/*
3947
* Notes for adding new callbacks
4048
* - Make sure to type annotate the callback, so we'll get the one in the new

‎src/jlapi.c

+2-3
Original file line numberDiff line numberDiff line change
@@ -208,14 +208,13 @@ DLLEXPORT jl_value_t *jl_call3(jl_function_t *f, jl_value_t *a, jl_value_t *b, j
208208
return v;
209209
}
210210

211-
JL_CALLABLE(jl_f_get_field);
212211
DLLEXPORT jl_value_t *jl_get_field(jl_value_t *o, char *fld)
213212
{
214213
jl_value_t *v;
215214
JL_TRY {
216215
jl_value_t *s = (jl_value_t*)jl_symbol(fld);
217-
jl_value_t *args[2] = {o, s};
218-
v = jl_f_get_field(NULL, args, 2);
216+
int i = jl_field_index((jl_datatype_t*)jl_typeof(o), (jl_sym_t*)s, 1);
217+
v = jl_get_nth_field(o, i);
219218
}
220219
JL_CATCH {
221220
v = NULL;

‎src/jltypes.c

+2-7
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@
1111
#include <malloc.h>
1212
#endif
1313
#include "julia.h"
14-
#include "newobj_internal.h"
15-
#include "jltypes_internal.h"
14+
#include "julia_internal.h"
1615
#include "builtin_proto.h"
1716

1817
jl_datatype_t *jl_any_type;
@@ -120,7 +119,7 @@ int jl_has_typevars(jl_value_t *v)
120119
return jl_has_typevars_(v, 0);
121120
}
122121

123-
DLLEXPORT int jl_is_leaf_type(jl_value_t *v)
122+
int jl_is_leaf_type(jl_value_t *v)
124123
{
125124
if (jl_is_datatype(v)) {
126125
if (((jl_datatype_t*)v)->abstract) {
@@ -216,7 +215,6 @@ static int union_elt_morespecific(const void *a, const void *b)
216215
// type definitions. (issue #2365)
217216
int inside_typedef = 0;
218217

219-
DLLEXPORT
220218
jl_tuple_t *jl_compute_type_union(jl_tuple_t *types)
221219
{
222220
size_t n = count_union_components(types);
@@ -1675,9 +1673,6 @@ jl_value_t *jl_cache_type_(jl_datatype_t *type)
16751673
return (jl_value_t*)type;
16761674
}
16771675

1678-
JL_CALLABLE(jl_f_tuple);
1679-
JL_CALLABLE(jl_f_ctor_trampoline);
1680-
16811676
typedef struct _jl_typestack_t {
16821677
jl_datatype_t *tt;
16831678
struct _jl_typestack_t *prev;

‎src/jltypes_internal.h

-11
This file was deleted.

0 commit comments

Comments
 (0)