comparison libinterp/corefcn/jit-ir.h @ 22197:e43d83253e28

refill multi-line macro definitions Use the Emacs C++ mode style for line continuation markers in multi-line macro definitions. * make_int.cc, __dsearchn__.cc, __magick_read__.cc, besselj.cc, bitfcns.cc, bsxfun.cc, cellfun.cc, data.cc, defun-dld.h, defun-int.h, defun.h, det.cc, error.h, find.cc, gcd.cc, graphics.cc, interpreter.h, jit-ir.h, jit-typeinfo.h, lookup.cc, ls-mat5.cc, max.cc, mexproto.h, mxarray.in.h, oct-stream.cc, ordschur.cc, pr-output.cc, profiler.h, psi.cc, regexp.cc, sparse-xdiv.cc, sparse-xpow.cc, tril.cc, txt-eng.h, utils.cc, variables.cc, variables.h, xdiv.cc, xpow.cc, __glpk__.cc, ov-base.cc, ov-base.h, ov-cell.cc, ov-ch-mat.cc, ov-classdef.cc, ov-complex.cc, ov-cx-mat.cc, ov-cx-sparse.cc, ov-float.cc, ov-float.h, ov-flt-complex.cc, ov-flt-cx-mat.cc, ov-flt-re-mat.cc, ov-int-traits.h, ov-lazy-idx.h, ov-perm.cc, ov-re-mat.cc, ov-re-sparse.cc, ov-scalar.cc, ov-scalar.h, ov-str-mat.cc, ov-type-conv.h, ov.cc, ov.h, op-class.cc, op-int-conv.cc, op-int.h, op-str-str.cc, ops.h, lex.ll, Array.cc, CMatrix.cc, CSparse.cc, MArray.cc, MArray.h, MDiagArray2.cc, MDiagArray2.h, MSparse.h, Sparse.cc, dMatrix.cc, dSparse.cc, fCMatrix.cc, fMatrix.cc, idx-vector.cc, f77-fcn.h, quit.h, bsxfun-decl.h, bsxfun-defs.cc, lo-specfun.cc, oct-convn.cc, oct-convn.h, oct-norm.cc, oct-norm.h, oct-rand.cc, Sparse-op-decls.h, Sparse-op-defs.h, mx-inlines.cc, mx-op-decl.h, mx-op-defs.h, mach-info.cc, oct-group.cc, oct-passwd.cc, oct-syscalls.cc, oct-time.cc, data-conv.cc, kpse.cc, lo-ieee.h, lo-macros.h, oct-cmplx.h, oct-glob.cc, oct-inttypes.cc, oct-inttypes.h, oct-locbuf.h, oct-sparse.h, url-transfer.cc, oct-conf-post.in.h, shared-fcns.h: Refill macro definitions.
author John W. Eaton <jwe@octave.org>
date Mon, 01 Aug 2016 12:40:18 -0400
parents b571fc85953f
children bac0d6f07a3e
comparison
equal deleted inserted replaced
22196:dd992fd74fce 22197:e43d83253e28
100 // factory. 100 // factory.
101 class 101 class
102 jit_factory 102 jit_factory
103 { 103 {
104 typedef std::list<jit_value *> value_list; 104 typedef std::list<jit_value *> value_list;
105 public: 105
106 public:
107
106 ~jit_factory (void); 108 ~jit_factory (void);
107 109
108 const value_list& constants (void) const { return mconstants; } 110 const value_list& constants (void) const { return mconstants; }
109 111
110 template <typename T> 112 template <typename T>
114 track_value (ret); 116 track_value (ret);
115 return ret; 117 return ret;
116 } 118 }
117 119
118 #define DECL_ARG(n) const ARG ## n& arg ## n 120 #define DECL_ARG(n) const ARG ## n& arg ## n
121
119 #define JIT_CREATE(N) \ 122 #define JIT_CREATE(N) \
120 template <typename T, OCT_MAKE_DECL_LIST (typename, ARG, N)> \ 123 template <typename T, OCT_MAKE_DECL_LIST (typename, ARG, N)> \
121 T *create (OCT_MAKE_LIST (DECL_ARG, N)) \ 124 T *create (OCT_MAKE_LIST (DECL_ARG, N)) \
122 { \ 125 { \
123 T *ret = new T (OCT_MAKE_ARG_LIST (arg, N)); \ 126 T *ret = new T (OCT_MAKE_ARG_LIST (arg, N)); \
130 JIT_CREATE (3) 133 JIT_CREATE (3)
131 JIT_CREATE (4) 134 JIT_CREATE (4)
132 135
133 #undef JIT_CREATE 136 #undef JIT_CREATE
134 #undef DECL_ARG 137 #undef DECL_ARG
135 private: 138
139 private:
140
136 void track_value (jit_value *v); 141 void track_value (jit_value *v);
137 142
138 value_list all_values; 143 value_list all_values;
139 144
140 value_list mconstants; 145 value_list mconstants;
338 already_infered.reserve (nargs); 343 already_infered.reserve (nargs);
339 marguments.reserve (nargs); 344 marguments.reserve (nargs);
340 } 345 }
341 346
342 #define STASH_ARG(i) stash_argument (i, arg ## i); 347 #define STASH_ARG(i) stash_argument (i, arg ## i);
348
343 #define JIT_INSTRUCTION_CTOR(N) \ 349 #define JIT_INSTRUCTION_CTOR(N) \
344 jit_instruction (OCT_MAKE_DECL_LIST (jit_value *, arg, N)) \ 350 jit_instruction (OCT_MAKE_DECL_LIST (jit_value *, arg, N)) \
345 : already_infered (N), marguments (N), mid (next_id ()), mparent (0) \ 351 : already_infered (N), marguments (N), mid (next_id ()), mparent (0) \
346 { \ 352 { \
347 OCT_ITERATE_MACRO (STASH_ARG, N); \ 353 OCT_ITERATE_MACRO (STASH_ARG, N); \
1020 1026
1021 class 1027 class
1022 jit_terminator : public jit_instruction 1028 jit_terminator : public jit_instruction
1023 { 1029 {
1024 public: 1030 public:
1025 #define JIT_TERMINATOR_CONST(N) \ 1031
1026 jit_terminator (size_t asuccessor_count, \ 1032 #define JIT_TERMINATOR_CONST(N) \
1027 OCT_MAKE_DECL_LIST (jit_value *, arg, N)) \ 1033 jit_terminator (size_t asuccessor_count, \
1028 : jit_instruction (OCT_MAKE_ARG_LIST (arg, N)), \ 1034 OCT_MAKE_DECL_LIST (jit_value *, arg, N)) \
1035 : jit_instruction (OCT_MAKE_ARG_LIST (arg, N)), \
1029 malive (asuccessor_count, false) { } 1036 malive (asuccessor_count, false) { }
1030 1037
1031 JIT_TERMINATOR_CONST (1) 1038 JIT_TERMINATOR_CONST (1)
1032 JIT_TERMINATOR_CONST (2) 1039 JIT_TERMINATOR_CONST (2)
1033 JIT_TERMINATOR_CONST (3) 1040 JIT_TERMINATOR_CONST (3)
1414 jit_ir_walker 1421 jit_ir_walker
1415 { 1422 {
1416 public: 1423 public:
1417 virtual ~jit_ir_walker () { } 1424 virtual ~jit_ir_walker () { }
1418 1425
1419 #define JIT_METH(clname) \ 1426 #define JIT_METH(clname) \
1420 virtual void visit (jit_ ## clname&) = 0; 1427 virtual void visit (jit_ ## clname&) = 0;
1421 1428
1422 JIT_VISIT_IR_CLASSES; 1429 JIT_VISIT_IR_CLASSES;
1423 1430
1424 #undef JIT_METH 1431 #undef JIT_METH