annotate src/link-deps.mk @ 15067:df4538e3b50b

ND scalar indexing in JIT. * src/jit-ir.cc (jit_magic_end::jit_magic_end): Use jit_magic_end::context. * src/jit-ir.h (jit_call::jit_call): New overload. (jit_magic_end::context): New class. (jit_magic_end::jit_magic_end): moved to src/jit-ir.cc. * src/jit-typeinfo.cc (octave_jit_paren_scalar): New function. (jit_typeinfo::jit_typeinfo): Generate ND scalar indexing. (jit_typeinfo::gen_subsref): New function. * src/jit-typeinfo.h (jit_typeinfo::gen_subsref): New declaration. * src/pt-jit.cc (jit_convert::visit_index_expression, jit_convert::do_assign): Update resolve call. (jit_convert::resolve): Resolve ND indices. * src/pt-jit.h (jit_convert::resolve): Change function signature.
author Max Brister <max@2bass.com>
date Tue, 31 Jul 2012 11:51:01 -0500
parents e499ebcd3b0f
children 000587f92082
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
13011
1609dd300c4d maint: add missing files for changeset edc5ec6e949b
John W. Eaton <jwe@octave.org>
parents:
diff changeset
1 include ../liboctave/link-deps.mk
1609dd300c4d maint: add missing files for changeset edc5ec6e949b
John W. Eaton <jwe@octave.org>
parents:
diff changeset
2
1609dd300c4d maint: add missing files for changeset edc5ec6e949b
John W. Eaton <jwe@octave.org>
parents:
diff changeset
3 if AMCOND_ENABLE_DYNAMIC_LINKING
1609dd300c4d maint: add missing files for changeset edc5ec6e949b
John W. Eaton <jwe@octave.org>
parents:
diff changeset
4 LIBOCTINTERP_LINK_DEPS =
1609dd300c4d maint: add missing files for changeset edc5ec6e949b
John W. Eaton <jwe@octave.org>
parents:
diff changeset
5 else
1609dd300c4d maint: add missing files for changeset edc5ec6e949b
John W. Eaton <jwe@octave.org>
parents:
diff changeset
6 LIBOCTINTERP_LINK_DEPS = $(DLD_FUNCTIONS_LIBS)
1609dd300c4d maint: add missing files for changeset edc5ec6e949b
John W. Eaton <jwe@octave.org>
parents:
diff changeset
7 endif
1609dd300c4d maint: add missing files for changeset edc5ec6e949b
John W. Eaton <jwe@octave.org>
parents:
diff changeset
8
1609dd300c4d maint: add missing files for changeset edc5ec6e949b
John W. Eaton <jwe@octave.org>
parents:
diff changeset
9 LIBOCTINTERP_LINK_DEPS += \
1609dd300c4d maint: add missing files for changeset edc5ec6e949b
John W. Eaton <jwe@octave.org>
parents:
diff changeset
10 $(GRAPHICS_LIBS) \
1609dd300c4d maint: add missing files for changeset edc5ec6e949b
John W. Eaton <jwe@octave.org>
parents:
diff changeset
11 $(FT2_LIBS) \
1609dd300c4d maint: add missing files for changeset edc5ec6e949b
John W. Eaton <jwe@octave.org>
parents:
diff changeset
12 $(HDF5_LIBS) \
1609dd300c4d maint: add missing files for changeset edc5ec6e949b
John W. Eaton <jwe@octave.org>
parents:
diff changeset
13 $(Z_LIBS) \
15039
e753177cde93 maint: Move non-dynamically linked functions from DLD-FUNCTIONS/ to corefcn/ directory
Rik <rik@octave.org>
parents: 14605
diff changeset
14 $(FFTW_XLIBS) \
e753177cde93 maint: Move non-dynamically linked functions from DLD-FUNCTIONS/ to corefcn/ directory
Rik <rik@octave.org>
parents: 14605
diff changeset
15 $(REGEX_LIBS) \
13011
1609dd300c4d maint: add missing files for changeset edc5ec6e949b
John W. Eaton <jwe@octave.org>
parents:
diff changeset
16 $(OPENGL_LIBS) \
1609dd300c4d maint: add missing files for changeset edc5ec6e949b
John W. Eaton <jwe@octave.org>
parents:
diff changeset
17 $(X11_LIBS) \
14605
f25d2224fa02 Initial JIT support
Max Brister <max@2bass.com>
parents: 13024
diff changeset
18 $(CARBON_LIBS) \
15049
e499ebcd3b0f Add LAPACK_LIBS to link dependencies of liboctinterp
Carlo de Falco <cdf@users.sourceforge.net>
parents: 15039
diff changeset
19 $(LLVM_LIBS) \
e499ebcd3b0f Add LAPACK_LIBS to link dependencies of liboctinterp
Carlo de Falco <cdf@users.sourceforge.net>
parents: 15039
diff changeset
20 $(LAPACK_LIBS)
13011
1609dd300c4d maint: add missing files for changeset edc5ec6e949b
John W. Eaton <jwe@octave.org>
parents:
diff changeset
21
1609dd300c4d maint: add missing files for changeset edc5ec6e949b
John W. Eaton <jwe@octave.org>
parents:
diff changeset
22 LIBOCTINTERP_LINK_OPTS = \
1609dd300c4d maint: add missing files for changeset edc5ec6e949b
John W. Eaton <jwe@octave.org>
parents:
diff changeset
23 $(GRAPHICS_LDFLAGS) \
1609dd300c4d maint: add missing files for changeset edc5ec6e949b
John W. Eaton <jwe@octave.org>
parents:
diff changeset
24 $(FT2_LDFLAGS) \
1609dd300c4d maint: add missing files for changeset edc5ec6e949b
John W. Eaton <jwe@octave.org>
parents:
diff changeset
25 $(HDF5_LDFLAGS) \
1609dd300c4d maint: add missing files for changeset edc5ec6e949b
John W. Eaton <jwe@octave.org>
parents:
diff changeset
26 $(Z_LDFLAGS) \
14605
f25d2224fa02 Initial JIT support
Max Brister <max@2bass.com>
parents: 13024
diff changeset
27 $(REGEX_LDFLAGS) \
15039
e753177cde93 maint: Move non-dynamically linked functions from DLD-FUNCTIONS/ to corefcn/ directory
Rik <rik@octave.org>
parents: 14605
diff changeset
28 $(FFTW_XLDFLAGS) \
14605
f25d2224fa02 Initial JIT support
Max Brister <max@2bass.com>
parents: 13024
diff changeset
29 $(LLVM_LDFLAGS)
13011
1609dd300c4d maint: add missing files for changeset edc5ec6e949b
John W. Eaton <jwe@octave.org>
parents:
diff changeset
30
1609dd300c4d maint: add missing files for changeset edc5ec6e949b
John W. Eaton <jwe@octave.org>
parents:
diff changeset
31 OCT_LINK_DEPS =
1609dd300c4d maint: add missing files for changeset edc5ec6e949b
John W. Eaton <jwe@octave.org>
parents:
diff changeset
32
13024
f3c53fea9fb5 maint: more linking tweaks
John W. Eaton <jwe@octave.org>
parents: 13022
diff changeset
33 OCT_LINK_OPTS = $(LDFLAGS)
13011
1609dd300c4d maint: add missing files for changeset edc5ec6e949b
John W. Eaton <jwe@octave.org>
parents:
diff changeset
34
1609dd300c4d maint: add missing files for changeset edc5ec6e949b
John W. Eaton <jwe@octave.org>
parents:
diff changeset
35 if AMCOND_LINK_ALL_DEPS
1609dd300c4d maint: add missing files for changeset edc5ec6e949b
John W. Eaton <jwe@octave.org>
parents:
diff changeset
36 LIBOCTINTERP_LINK_DEPS += $(LIBOCTAVE_LINK_DEPS)
1609dd300c4d maint: add missing files for changeset edc5ec6e949b
John W. Eaton <jwe@octave.org>
parents:
diff changeset
37 LIBOCTINTERP_LINK_OPTS += $(LIBOCTAVE_LINK_OPTS)
1609dd300c4d maint: add missing files for changeset edc5ec6e949b
John W. Eaton <jwe@octave.org>
parents:
diff changeset
38
1609dd300c4d maint: add missing files for changeset edc5ec6e949b
John W. Eaton <jwe@octave.org>
parents:
diff changeset
39 OCTAVE_LINK_DEPS = $(LIBOCTINTERP_LINK_DEPS)
1609dd300c4d maint: add missing files for changeset edc5ec6e949b
John W. Eaton <jwe@octave.org>
parents:
diff changeset
40 OCTAVE_LINK_OPTS = $(LIBOCTINTERP_LINK_OPTS)
1609dd300c4d maint: add missing files for changeset edc5ec6e949b
John W. Eaton <jwe@octave.org>
parents:
diff changeset
41
1609dd300c4d maint: add missing files for changeset edc5ec6e949b
John W. Eaton <jwe@octave.org>
parents:
diff changeset
42 OCT_LINK_DEPS += $(LIBOCTINTERP_LINK_DEPS)
1609dd300c4d maint: add missing files for changeset edc5ec6e949b
John W. Eaton <jwe@octave.org>
parents:
diff changeset
43 OCT_LINK_OPTS += $(LIBOCTINTERP_LINK_OPTS)
1609dd300c4d maint: add missing files for changeset edc5ec6e949b
John W. Eaton <jwe@octave.org>
parents:
diff changeset
44 endif