# HG changeset patch # User Shinji KONO # Date 1544339126 -32400 # Node ID 2d03fdcd8b7f68fed417cdad42c61343811b5890 # Parent 585f22dcc6aa1b4a2059aee09c3d2cdf6e21af02# Parent d385af306a13fe2e4c85f8e859dfae6a077bbb51 merge diff -r 585f22dcc6aa -r 2d03fdcd8b7f build/Makefile.in --- a/build/Makefile.in Sun Dec 09 16:04:54 2018 +0900 +++ b/build/Makefile.in Sun Dec 09 16:05:26 2018 +0900 @@ -82,6 +82,7 @@ src/core/args@obj@ \ src/core/exceptions@obj@ \ src/core/interp@obj@ \ + src/core/cbc-interp@obj@ \ src/core/threadcontext@obj@ \ src/core/compunit@obj@ \ src/core/bytecode@obj@ \ @@ -242,6 +243,7 @@ src/core/args.h \ src/core/exceptions.h \ src/core/interp.h \ + src/core/oplables-cbc-codes.h \ src/core/alloc.h \ src/core/vector.h \ src/core/frame.h \ @@ -475,7 +477,7 @@ DYNASM_SCRIPTS = 3rdparty/dynasm/dynasm.lua 3rdparty/dynasm/dasm_x86.lua DYNASM_HEADERS = 3rdparty/dynasm/dasm_proto.h 3rdparty/dynasm/dasm_x86.h -.SUFFIXES: .c @obj@ .i @asm@ .dasc .expr .tile +.SUFFIXES: .c .cbc @obj@ .i @asm@ .dasc .expr .tile all: moar@exe@ pkgconfig/moar.pc @@ -585,6 +587,18 @@ $(MSG) compiling $@ $(CMD)$(CC) @ccswitch@ $(CFLAGS) @objflags@ $(CINCLUDES) @ccout@$@ $*.c +.cbc.i: + $(MSG) pre-processing $@ + $(CMD)$(CC) @cppswitch@ $(CFLAGS) @objflags@ $(CINCLUDES) @cppout@$@ $*.cbc + +.cbc@asm@: + $(MSG) generating assembler for $@ + $(CMD)$(CC) @asmswitch@ $(CFLAGS) @objflags@ $(CINCLUDES) @asmout@$@ $*.cbc + +.cbc@obj@: + $(MSG) compiling $@ + $(CMD)$(CC) @ccswitch@ $(CFLAGS) @objflags@ $(CINCLUDES) @ccout@$@ $*.cbc + src/main@obj@: src/main.c $(MSG) compiling $@