summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--AUTHORS6
-rw-r--r--COPYING2
-rw-r--r--Makefile.am8
-rw-r--r--NEWS2
-rw-r--r--configure.ac79
-rw-r--r--data/Makefile.am6
-rw-r--r--data/embryo/default.inc (renamed from legacy/embryo/include/default.inc)0
-rw-r--r--m4/efl_check_funcs.m447
-rw-r--r--old/ChangeLog.embryo (renamed from legacy/embryo/ChangeLog)0
-rw-r--r--old/NEWS.embryo (renamed from legacy/embryo/NEWS)0
-rw-r--r--old/README.embryo (renamed from legacy/embryo/README)0
-rw-r--r--pc/embryo.pc.in (renamed from legacy/embryo/embryo.pc.in)2
-rw-r--r--src/bin/Makefile.am2
-rw-r--r--src/bin/embryo/Makefile.am49
-rw-r--r--src/bin/embryo/embryo_cc_amx.h (renamed from legacy/embryo/src/bin/embryo_cc_amx.h)0
-rw-r--r--src/bin/embryo/embryo_cc_osdefs.h (renamed from legacy/embryo/src/bin/embryo_cc_osdefs.h)0
-rw-r--r--src/bin/embryo/embryo_cc_prefix.c (renamed from legacy/embryo/src/bin/embryo_cc_prefix.c)0
-rw-r--r--src/bin/embryo/embryo_cc_prefix.h (renamed from legacy/embryo/src/bin/embryo_cc_prefix.h)0
-rw-r--r--src/bin/embryo/embryo_cc_sc.h (renamed from legacy/embryo/src/bin/embryo_cc_sc.h)0
-rw-r--r--src/bin/embryo/embryo_cc_sc1.c (renamed from legacy/embryo/src/bin/embryo_cc_sc1.c)8
-rw-r--r--src/bin/embryo/embryo_cc_sc2.c (renamed from legacy/embryo/src/bin/embryo_cc_sc2.c)0
-rw-r--r--src/bin/embryo/embryo_cc_sc3.c (renamed from legacy/embryo/src/bin/embryo_cc_sc3.c)32
-rw-r--r--src/bin/embryo/embryo_cc_sc4.c (renamed from legacy/embryo/src/bin/embryo_cc_sc4.c)4
-rw-r--r--src/bin/embryo/embryo_cc_sc5.c (renamed from legacy/embryo/src/bin/embryo_cc_sc5.c)2
-rw-r--r--src/bin/embryo/embryo_cc_sc5.scp (renamed from legacy/embryo/src/bin/embryo_cc_sc5.scp)0
-rw-r--r--src/bin/embryo/embryo_cc_sc6.c (renamed from legacy/embryo/src/bin/embryo_cc_sc6.c)47
-rw-r--r--src/bin/embryo/embryo_cc_sc7.c (renamed from legacy/embryo/src/bin/embryo_cc_sc7.c)14
-rw-r--r--src/bin/embryo/embryo_cc_sc7.scp (renamed from legacy/embryo/src/bin/embryo_cc_sc7.scp)0
-rw-r--r--src/bin/embryo/embryo_cc_scexpand.c (renamed from legacy/embryo/src/bin/embryo_cc_scexpand.c)0
-rw-r--r--src/bin/embryo/embryo_cc_sclist.c (renamed from legacy/embryo/src/bin/embryo_cc_sclist.c)6
-rw-r--r--src/bin/embryo/embryo_cc_scvars.c (renamed from legacy/embryo/src/bin/embryo_cc_scvars.c)0
-rw-r--r--src/lib/Makefile.am2
-rw-r--r--src/lib/embryo/Embryo.h (renamed from legacy/embryo/src/lib/Embryo.h)0
-rw-r--r--src/lib/embryo/Makefile.am38
-rw-r--r--src/lib/embryo/embryo_amx.c (renamed from legacy/embryo/src/lib/embryo_amx.c)6
-rw-r--r--src/lib/embryo/embryo_args.c (renamed from legacy/embryo/src/lib/embryo_args.c)4
-rw-r--r--src/lib/embryo/embryo_float.c (renamed from legacy/embryo/src/lib/embryo_float.c)46
-rw-r--r--src/lib/embryo/embryo_main.c (renamed from legacy/embryo/src/lib/embryo_main.c)0
-rw-r--r--src/lib/embryo/embryo_private.h (renamed from legacy/embryo/src/lib/embryo_private.h)8
-rw-r--r--src/lib/embryo/embryo_rand.c (renamed from legacy/embryo/src/lib/embryo_rand.c)6
-rw-r--r--src/lib/embryo/embryo_str.c (renamed from legacy/embryo/src/lib/embryo_str.c)0
-rw-r--r--src/lib/embryo/embryo_time.c (renamed from legacy/embryo/src/lib/embryo_time.c)8
42 files changed, 326 insertions, 108 deletions
diff --git a/AUTHORS b/AUTHORS
index cbe4f39e00..7b4bc356c5 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -62,3 +62,9 @@ Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
62Lionel Orry <lionel.orry@gmail.com> 62Lionel Orry <lionel.orry@gmail.com>
63Jérôme Pinot <ngc891@gmail.com> 63Jérôme Pinot <ngc891@gmail.com>
64Leandro Santiago <leandrosansilva@gmail.com> 64Leandro Santiago <leandrosansilva@gmail.com>
65
66Embryo
67------
68
69The Rasterman (Carsten Haitzler) <raster@rasterman.com>
70Jérôme Pinot <ngc891@gmail.com>
diff --git a/COPYING b/COPYING
index afd8438b6e..40367789be 100644
--- a/COPYING
+++ b/COPYING
@@ -4,3 +4,5 @@ name and the license file covering it.
4evil: licenses/COPYING.BSD 4evil: licenses/COPYING.BSD
5eet: licenses/COPYING.BSD 5eet: licenses/COPYING.BSD
6eina: licenses/COPYING.LGPL 6eina: licenses/COPYING.LGPL
7eo: licenses/COPYING.BSD
8embryo: licenses/COPYING.BSD
diff --git a/Makefile.am b/Makefile.am
index c6cbaeac5a..403cc9f9ac 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
1ACLOCAL_AMFLAGS = -I m4 1ACLOCAL_AMFLAGS = -I m4
2 2
3SUBDIRS = src doc 3SUBDIRS = src data doc
4 4
5MAINTAINERCLEANFILES = \ 5MAINTAINERCLEANFILES = \
6Makefile.in \ 6Makefile.in \
@@ -48,7 +48,8 @@ spec/efl.spec \
48pc/evil.pc \ 48pc/evil.pc \
49pc/eina.pc \ 49pc/eina.pc \
50pc/eet.pc \ 50pc/eet.pc \
51pc/eo.pc 51pc/eo.pc \
52pc/embryo.pc
52 53
53pkgconfigdir = $(libdir)/pkgconfig 54pkgconfigdir = $(libdir)/pkgconfig
54pkgconfig_DATA = 55pkgconfig_DATA =
@@ -60,7 +61,8 @@ endif
60pkgconfig_DATA += \ 61pkgconfig_DATA += \
61pc/eina.pc \ 62pc/eina.pc \
62pc/eo.pc \ 63pc/eo.pc \
63pc/eet.pc 64pc/eet.pc \
65pc/embryo.pc
64 66
65 67
66.PHONY: doc benchmark examples install-examples 68.PHONY: doc benchmark examples install-examples
diff --git a/NEWS b/NEWS
index ff5e32f5d9..5e05538268 100644
--- a/NEWS
+++ b/NEWS
@@ -10,7 +10,7 @@ Additions:
10 * Add eina_barrier thread API 10 * Add eina_barrier thread API
11 * Add eina_tmpstr_add() and eina_tmpstr_del() 11 * Add eina_tmpstr_add() and eina_tmpstr_del()
12 * Add eina_thread API 12 * Add eina_thread API
13 13
14Improvements: 14Improvements:
15 * Single EFL tree now covring all EFL library components. 15 * Single EFL tree now covring all EFL library components.
16 * Speedup Eina Rbtree Iterator by recycling memory instead of 16 * Speedup Eina Rbtree Iterator by recycling memory instead of
diff --git a/configure.ac b/configure.ac
index a99357b351..bff70be5d7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -57,7 +57,7 @@ requirements_libs_eo=""
57requirements_libs_eet="" 57requirements_libs_eet=""
58#requirements_libs_evas="" 58#requirements_libs_evas=""
59#requirements_libs_ecore="" 59#requirements_libs_ecore=""
60#requirements_libs_embryo="" 60requirements_libs_embryo=""
61#requirements_libs_eio="" 61#requirements_libs_eio=""
62#requirements_libs_edje="" 62#requirements_libs_edje=""
63#requirements_libs_efreet="" 63#requirements_libs_efreet=""
@@ -73,7 +73,7 @@ requirements_libs_deps_eo=""
73requirements_libs_deps_eet="" 73requirements_libs_deps_eet=""
74#requirements_libs_deps_evas="" 74#requirements_libs_deps_evas=""
75#requirements_libs_deps_ecore="" 75#requirements_libs_deps_ecore=""
76#requirements_libs_deps_embryo="" 76requirements_libs_deps_embryo=""
77#requirements_libs_deps_eio="" 77#requirements_libs_deps_eio=""
78#requirements_libs_deps_edje="" 78#requirements_libs_deps_edje=""
79#requirements_libs_deps_efreet="" 79#requirements_libs_deps_efreet=""
@@ -88,7 +88,7 @@ requirements_pc_eo=""
88requirements_pc_eet="" 88requirements_pc_eet=""
89#requirements_pc_evas="" 89#requirements_pc_evas=""
90#requirements_pc_ecore="" 90#requirements_pc_ecore=""
91#requirements_pc_embryo="" 91requirements_pc_embryo=""
92#requirements_pc_eio="" 92#requirements_pc_eio=""
93#requirements_pc_edje="" 93#requirements_pc_edje=""
94#requirements_pc_efreet="" 94#requirements_pc_efreet=""
@@ -103,7 +103,7 @@ requirements_pc_deps_eo=""
103requirements_pc_deps_eet="" 103requirements_pc_deps_eet=""
104#requirements_pc_deps_evas="" 104#requirements_pc_deps_evas=""
105#requirements_pc_deps_ecore="" 105#requirements_pc_deps_ecore=""
106#requirements_pc_deps_embryo="" 106requirements_pc_deps_embryo=""
107#requirements_pc_deps_eio="" 107#requirements_pc_deps_eio=""
108#requirements_pc_deps_edje="" 108#requirements_pc_deps_edje=""
109#requirements_pc_deps_efreet="" 109#requirements_pc_deps_efreet=""
@@ -119,7 +119,7 @@ AC_SUBST([requirements_libs_eo])
119AC_SUBST([requirements_libs_eet]) 119AC_SUBST([requirements_libs_eet])
120#AC_SUBST([requirements_libs_evas]) 120#AC_SUBST([requirements_libs_evas])
121#AC_SUBST([requirements_libs_ecore]) 121#AC_SUBST([requirements_libs_ecore])
122#AC_SUBST([requirements_libs_embryo]) 122AC_SUBST([requirements_libs_embryo])
123#AC_SUBST([requirements_libs_eio]) 123#AC_SUBST([requirements_libs_eio])
124#AC_SUBST([requirements_libs_edje]) 124#AC_SUBST([requirements_libs_edje])
125#AC_SUBST([requirements_libs_efreet]) 125#AC_SUBST([requirements_libs_efreet])
@@ -134,7 +134,7 @@ AC_SUBST([requirements_pc_eo])
134AC_SUBST([requirements_pc_eet]) 134AC_SUBST([requirements_pc_eet])
135#AC_SUBST([requirements_pc_evas]) 135#AC_SUBST([requirements_pc_evas])
136#AC_SUBST([requirements_pc_ecore]) 136#AC_SUBST([requirements_pc_ecore])
137#AC_SUBST([requirements_pc_embryo]) 137AC_SUBST([requirements_pc_embryo])
138#AC_SUBST([requirements_pc_eio]) 138#AC_SUBST([requirements_pc_eio])
139#AC_SUBST([requirements_pc_edje]) 139#AC_SUBST([requirements_pc_edje])
140#AC_SUBST([requirements_pc_efreet]) 140#AC_SUBST([requirements_pc_efreet])
@@ -331,6 +331,9 @@ strlcpy \
331 331
332AC_FUNC_ALLOCA 332AC_FUNC_ALLOCA
333 333
334EFL_CHECK_FUNCS([EFL], [fnmatch gettimeofday])
335
336
334 337
335###################### EFL ###################### 338###################### EFL ######################
336 339
@@ -583,7 +586,7 @@ EFL_CHECK_LINKER_FLAGS([EINA], [-fno-strict-aliasing])
583 586
584### Checks for library functions 587### Checks for library functions
585 588
586EFL_CHECK_FUNCS([EINA], [dirfd dlopen dladdr fnmatch iconv shm_open setxattr]) 589EFL_CHECK_FUNCS([EINA], [dirfd dlopen dladdr iconv shm_open setxattr])
587 590
588enable_log="no" 591enable_log="no"
589if test "x${efl_func_fnmatch}" = "xyes" && test "x${want_log}" = "xyes" ; then 592if test "x${efl_func_fnmatch}" = "xyes" && test "x${want_log}" = "xyes" ; then
@@ -752,8 +755,6 @@ EET_LIBS="${EET_LIBS} ${requirements_libs_deps_eet}"
752 755
753### Checks for compiler characteristics 756### Checks for compiler characteristics
754 757
755EFL_CHECK_COMPILER_FLAGS([EET], [-Wshadow -Wpointer-arith])
756
757### Checks for linker characteristics 758### Checks for linker characteristics
758 759
759case "${host_os}" in 760case "${host_os}" in
@@ -815,8 +816,65 @@ AM_CONDITIONAL([EO_BUILD_EXAMPLE_EVAS], [test "x${have_elm}" = "xyes"])
815#### End of Eo 816#### End of Eo
816 817
817 818
819#### Embryo
820
821AC_MSG_NOTICE([Embryo checks])
822
823### Default values
824
825### Additional options to configure
826
827### Checks for programs
828
829### Checks for libraries
830
831## Compatibility layers
832
833# Evil library for compilation on Windows
834
835case "$host_os" in
836 mingw*)
837 requirements_pc_embryo="${requirements_pc_embryo} evil >= ${PACKAGE_VERSION}"
838 ;;
839esac
840
841# Eina library
842
843requirements_pc_embryo="eina >= ${PACKAGE_VERSION} ${requirements_pc_embryo}"
844
845AC_ARG_VAR([EMBRYO_CFLAGS], [preprocessor flags for Embryo])
846AC_SUBST([EMBRYO_CFLAGS])
847AC_ARG_VAR([EMBRYO_LIBS], [linker flags for Embryo])
848AC_SUBST([EMBRYO_LIBS])
849
850### Checks for header files
851
852### Checks for types
853
854### Checks for structures
855
856### Checks for compiler characteristics
857
858### Checks for linker characteristics
859
860### Checks for library functions
861
862if ! test "x${efl_func_fnmatch}" = "xyes" ; then
863 AC_MSG_ERROR([Cannot find fnmatch()])
864fi
865
866if ! test "x${efl_func_gettimeofday}" = "xyes" ; then
867 AC_MSG_ERROR([Cannot find gettimeofday()])
868fi
869
870### Check availability
871
872#### End of Embryo
873
874
818AC_CONFIG_FILES([ 875AC_CONFIG_FILES([
819Makefile 876Makefile
877data/Makefile
820doc/Makefile 878doc/Makefile
821doc/Doxyfile 879doc/Doxyfile
822src/Makefile 880src/Makefile
@@ -826,6 +884,7 @@ src/benchmarks/eo/Makefile
826src/bin/Makefile 884src/bin/Makefile
827src/bin/evil/Makefile 885src/bin/evil/Makefile
828src/bin/eet/Makefile 886src/bin/eet/Makefile
887src/bin/embryo/Makefile
829src/examples/Makefile 888src/examples/Makefile
830src/examples/eina/Makefile 889src/examples/eina/Makefile
831src/examples/eet/Makefile 890src/examples/eet/Makefile
@@ -836,6 +895,7 @@ src/lib/eina/Makefile
836src/lib/eina/eina_config.h 895src/lib/eina/eina_config.h
837src/lib/eet/Makefile 896src/lib/eet/Makefile
838src/lib/eo/Makefile 897src/lib/eo/Makefile
898src/lib/embryo/Makefile
839src/modules/Makefile 899src/modules/Makefile
840src/modules/eina/Makefile 900src/modules/eina/Makefile
841src/modules/eina/mp/Makefile 901src/modules/eina/mp/Makefile
@@ -853,6 +913,7 @@ pc/evil.pc
853pc/eina.pc 913pc/eina.pc
854pc/eet.pc 914pc/eet.pc
855pc/eo.pc 915pc/eo.pc
916pc/embryo.pc
856]) 917])
857 918
858AC_OUTPUT 919AC_OUTPUT
diff --git a/data/Makefile.am b/data/Makefile.am
new file mode 100644
index 0000000000..8fdcec7de8
--- /dev/null
+++ b/data/Makefile.am
@@ -0,0 +1,6 @@
1MAINTAINERCLEANFILES = Makefile.in
2
3filesdir = $(pkgdatadir)/include
4files_DATA = embryo/default.inc
5
6EXTRA_DIST = $(files_DATA)
diff --git a/legacy/embryo/include/default.inc b/data/embryo/default.inc
index b82ff14b0a..b82ff14b0a 100644
--- a/legacy/embryo/include/default.inc
+++ b/data/embryo/default.inc
diff --git a/m4/efl_check_funcs.m4 b/m4/efl_check_funcs.m4
index 1611633a15..23712bcdd7 100644
--- a/m4/efl_check_funcs.m4
+++ b/m4/efl_check_funcs.m4
@@ -7,6 +7,7 @@ dnl dirfd
7dnl dladdr 7dnl dladdr
8dnl dlopen 8dnl dlopen
9dnl fnmatch 9dnl fnmatch
10dnl gettimeofday
10dnl iconv 11dnl iconv
11dnl setxattr (an al.) 12dnl setxattr (an al.)
12dnl shm_open 13dnl shm_open
@@ -232,6 +233,52 @@ esac
232AS_IF([test "x${_efl_have_fct}" = "xyes"], [$2], [$3]) 233AS_IF([test "x${_efl_have_fct}" = "xyes"], [$2], [$3])
233]) 234])
234 235
236dnl _EFL_CHECK_FUNC_GETTIMEOFDAY is for internal use
237dnl _EFL_CHECK_FUNC_GETTIMEOFDAY(EFL, ACTION-IF-FOUND, ACTION-IF-NOT-FOUND)
238
239AC_DEFUN([_EFL_CHECK_FUNC_GETTIMEOFDAY],
240[
241case "$host_os" in
242 mingw*)
243 _efl_have_fct="yes"
244 ;;
245 *)
246 AC_LINK_IFELSE(
247 [AC_LANG_PROGRAM([[
248#include <stdlib.h>
249#include <sys/time.h>
250 ]],
251 [[
252int res;
253res = gettimeofday(NULL, NULL);
254 ]])],
255 [_efl_have_fct="yes"],
256 [_efl_have_fct="no"])
257
258 if test "x${_efl_have_fct}" = "xno" && test "x${enable_exotic}" = "xyes"; then
259 SAVE_LIBS="${LIBS}"
260 SAVE_CFLAGS="${CFLAGS}"
261 LIBS="${LIBS} ${EXOTIC_LIBS}"
262 CFLAGS="${CFLAGS} ${EXOTIC_CFLAGS}"
263 AC_LINK_IFELSE(
264 [AC_LANG_PROGRAM([[
265#include <Exotic.h>
266 ]],
267 [[
268int res;
269res = gettimeofday(NULL, NULL);
270 ]])],
271 [_efl_have_fct="yes"],
272 [_efl_have_fct="no"])
273 LIBS="${SAVE_LIBS}"
274 CFLAGS="${SAVE_CFLAGS}"
275 fi
276 ;;
277esac
278
279AS_IF([test "x${_efl_have_fct}" = "xyes"], [$2], [$3])
280])
281
235dnl _EFL_CHECK_FUNC_ICONV_PRIV is for internal use 282dnl _EFL_CHECK_FUNC_ICONV_PRIV is for internal use
236dnl _EFL_CHECK_FUNC_ICONV_PRIV(EFL, LIB, ACTION-IF-FOUND, ACTION-IF-NOT-FOUND) 283dnl _EFL_CHECK_FUNC_ICONV_PRIV(EFL, LIB, ACTION-IF-FOUND, ACTION-IF-NOT-FOUND)
237 284
diff --git a/legacy/embryo/ChangeLog b/old/ChangeLog.embryo
index 2611b8421f..2611b8421f 100644
--- a/legacy/embryo/ChangeLog
+++ b/old/ChangeLog.embryo
diff --git a/legacy/embryo/NEWS b/old/NEWS.embryo
index 5b0201b898..5b0201b898 100644
--- a/legacy/embryo/NEWS
+++ b/old/NEWS.embryo
diff --git a/legacy/embryo/README b/old/README.embryo
index a434404b2c..a434404b2c 100644
--- a/legacy/embryo/README
+++ b/old/README.embryo
diff --git a/legacy/embryo/embryo.pc.in b/pc/embryo.pc.in
index bea0736579..8e5062ca9f 100644
--- a/legacy/embryo/embryo.pc.in
+++ b/pc/embryo.pc.in
@@ -8,8 +8,8 @@ embryoincludedir=@datadir@/include
8 8
9Name: embryo 9Name: embryo
10Description: A small virtual machine engine and bytecode compiler 10Description: A small virtual machine engine and bytecode compiler
11@pkgconfig_requires_private@: @requirement_embryo@
12Version: @VERSION@ 11Version: @VERSION@
12Requires.private: @requirements_pc_embryo@
13Libs: -L${libdir} -lembryo 13Libs: -L${libdir} -lembryo
14Libs.private: @EFL_FNMATCH_LIBS@ -lm 14Libs.private: @EFL_FNMATCH_LIBS@ -lm
15Cflags: -I${includedir}/embryo-@VMAJ@ 15Cflags: -I${includedir}/embryo-@VMAJ@
diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index 70889282e3..ca26cca78a 100644
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -8,4 +8,4 @@ SUBDIRS += evil
8 8
9endif 9endif
10 10
11SUBDIRS += eet 11SUBDIRS += eet embryo
diff --git a/src/bin/embryo/Makefile.am b/src/bin/embryo/Makefile.am
new file mode 100644
index 0000000000..e31a5bee62
--- /dev/null
+++ b/src/bin/embryo/Makefile.am
@@ -0,0 +1,49 @@
1
2MAINTAINERCLEANFILES = Makefile.in
3
4AM_CPPFLAGS = \
5-I$(top_srcdir)/src/lib/eina \
6-I$(top_srcdir)/src/lib/embryo \
7-I$(top_builddir)/src/lib/eina \
8-I$(top_builddir)/src/lib/embryo \
9-DPACKAGE_BIN_DIR=\"$(bindir)\" \
10-DPACKAGE_LIB_DIR=\"$(libdir)\" \
11-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
12@EFL_CFLAGS@
13
14if HAVE_WINDOWS
15AM_CPPFLAGS += \
16-I$(top_srcdir)/src/lib/evil \
17-I$(top_builddir)/src/lib/evil
18endif
19
20bin_PROGRAMS = embryo_cc
21
22embryo_cc_SOURCES = \
23embryo_cc_amx.h \
24embryo_cc_sc.h \
25embryo_cc_sc1.c \
26embryo_cc_sc2.c \
27embryo_cc_sc3.c \
28embryo_cc_sc4.c \
29embryo_cc_sc5.c \
30embryo_cc_sc6.c \
31embryo_cc_sc7.c \
32embryo_cc_scexpand.c \
33embryo_cc_sclist.c \
34embryo_cc_scvars.c \
35embryo_cc_prefix.c \
36embryo_cc_prefix.h
37
38embryo_cc_LDADD = \
39$(top_builddir)/src/lib/embryo/libembryo.la \
40$(top_builddir)/src/lib/eina/libeina.la \
41-lm
42
43if HAVE_WINDOWS
44embryo_cc_LDADD += $(top_builddir)/src/lib/evil/libevil.la
45endif
46
47EXTRA_DIST = \
48embryo_cc_sc5.scp \
49embryo_cc_sc7.scp
diff --git a/legacy/embryo/src/bin/embryo_cc_amx.h b/src/bin/embryo/embryo_cc_amx.h
index 0118e2d2af..0118e2d2af 100644
--- a/legacy/embryo/src/bin/embryo_cc_amx.h
+++ b/src/bin/embryo/embryo_cc_amx.h
diff --git a/legacy/embryo/src/bin/embryo_cc_osdefs.h b/src/bin/embryo/embryo_cc_osdefs.h
index e69de29bb2..e69de29bb2 100644
--- a/legacy/embryo/src/bin/embryo_cc_osdefs.h
+++ b/src/bin/embryo/embryo_cc_osdefs.h
diff --git a/legacy/embryo/src/bin/embryo_cc_prefix.c b/src/bin/embryo/embryo_cc_prefix.c
index 9b57704617..9b57704617 100644
--- a/legacy/embryo/src/bin/embryo_cc_prefix.c
+++ b/src/bin/embryo/embryo_cc_prefix.c
diff --git a/legacy/embryo/src/bin/embryo_cc_prefix.h b/src/bin/embryo/embryo_cc_prefix.h
index d6dc7b2a31..d6dc7b2a31 100644
--- a/legacy/embryo/src/bin/embryo_cc_prefix.h
+++ b/src/bin/embryo/embryo_cc_prefix.h
diff --git a/legacy/embryo/src/bin/embryo_cc_sc.h b/src/bin/embryo/embryo_cc_sc.h
index 9eaf6b86e0..9eaf6b86e0 100644
--- a/legacy/embryo/src/bin/embryo_cc_sc.h
+++ b/src/bin/embryo/embryo_cc_sc.h
diff --git a/legacy/embryo/src/bin/embryo_cc_sc1.c b/src/bin/embryo/embryo_cc_sc1.c
index 9ee3ad80fa..53baf36539 100644
--- a/legacy/embryo/src/bin/embryo_cc_sc1.c
+++ b/src/bin/embryo/embryo_cc_sc1.c
@@ -40,7 +40,9 @@
40 40
41#ifdef HAVE_EVIL 41#ifdef HAVE_EVIL
42# include <Evil.h> 42# include <Evil.h>
43#endif /* HAVE_EVIL */ 43#endif
44
45#include <Eina.h>
44 46
45#include "embryo_cc_sc.h" 47#include "embryo_cc_sc.h"
46#include "embryo_cc_prefix.h" 48#include "embryo_cc_prefix.h"
@@ -117,7 +119,7 @@ static int *wqptr; /* pointer to next entry */
117static char binfname[PATH_MAX]; /* binary file name */ 119static char binfname[PATH_MAX]; /* binary file name */
118 120
119int 121int
120main(int argc, char *argv[], char *env[] __UNUSED__) 122main(int argc, char *argv[], char *env[] EINA_UNUSED)
121{ 123{
122 e_prefix_determine(argv[0]); 124 e_prefix_determine(argv[0]);
123 return sc_compile(argc, argv); 125 return sc_compile(argc, argv);
@@ -573,7 +575,7 @@ initglobals(void)
573 575
574static void 576static void
575parseoptions(int argc, char **argv, char *iname, char *oname, 577parseoptions(int argc, char **argv, char *iname, char *oname,
576 char *pname __UNUSED__, char *rname __UNUSED__) 578 char *pname EINA_UNUSED, char *rname EINA_UNUSED)
577{ 579{
578 char str[PATH_MAX]; 580 char str[PATH_MAX];
579 int i, stack_size; 581 int i, stack_size;
diff --git a/legacy/embryo/src/bin/embryo_cc_sc2.c b/src/bin/embryo/embryo_cc_sc2.c
index f72703a64e..f72703a64e 100644
--- a/legacy/embryo/src/bin/embryo_cc_sc2.c
+++ b/src/bin/embryo/embryo_cc_sc2.c
diff --git a/legacy/embryo/src/bin/embryo_cc_sc3.c b/src/bin/embryo/embryo_cc_sc3.c
index 1206857730..b1f8aa5480 100644
--- a/legacy/embryo/src/bin/embryo_cc_sc3.c
+++ b/src/bin/embryo/embryo_cc_sc3.c
@@ -390,10 +390,10 @@ skim(int *opstr, void (*testfunc) (int), int dropval, int endval,
390 int lvalue, hits, droplab, endlab, opidx; 390 int lvalue, hits, droplab, endlab, opidx;
391 int allconst; 391 int allconst;
392 cell constval; 392 cell constval;
393 int index; 393 int idx;
394 cell cidx; 394 cell cidx;
395 395
396 stgget(&index, &cidx); /* mark position in code generator */ 396 stgget(&idx, &cidx); /* mark position in code generator */
397 hits = FALSE; /* no logical operators "hit" yet */ 397 hits = FALSE; /* no logical operators "hit" yet */
398 allconst = TRUE; /* assume all values "const" */ 398 allconst = TRUE; /* assume all values "const" */
399 constval = 0; 399 constval = 0;
@@ -440,7 +440,7 @@ skim(int *opstr, void (*testfunc) (int), int dropval, int endval,
440 { 440 {
441 lval->ident = iCONSTEXPR; 441 lval->ident = iCONSTEXPR;
442 lval->constval = constval; 442 lval->constval = constval;
443 stgdel(index, cidx); /* scratch generated code and calculate */ 443 stgdel(idx, cidx); /* scratch generated code and calculate */
444 } 444 }
445 else 445 else
446 { 446 {
@@ -589,13 +589,13 @@ plnge_rel(int *opstr, int opoff, int (*hier) (value * lval), value * lval)
589static int 589static int
590plnge1(int (*hier) (value * lval), value * lval) 590plnge1(int (*hier) (value * lval), value * lval)
591{ 591{
592 int lvalue, index; 592 int lvalue, idx;
593 cell cidx; 593 cell cidx;
594 594
595 stgget(&index, &cidx); /* mark position in code generator */ 595 stgget(&idx, &cidx); /* mark position in code generator */
596 lvalue = (*hier) (lval); 596 lvalue = (*hier) (lval);
597 if (lval->ident == iCONSTEXPR) 597 if (lval->ident == iCONSTEXPR)
598 stgdel(index, cidx); /* load constant later */ 598 stgdel(idx, cidx); /* load constant later */
599 return lvalue; 599 return lvalue;
600} 600}
601 601
@@ -608,10 +608,10 @@ static void
608plnge2(void (*oper) (void), 608plnge2(void (*oper) (void),
609 int (*hier) (value * lval), value * lval1, value * lval2) 609 int (*hier) (value * lval), value * lval1, value * lval2)
610{ 610{
611 int index; 611 int idx;
612 cell cidx; 612 cell cidx;
613 613
614 stgget(&index, &cidx); /* mark position in code generator */ 614 stgget(&idx, &cidx); /* mark position in code generator */
615 if (lval1->ident == iCONSTEXPR) 615 if (lval1->ident == iCONSTEXPR)
616 { /* constant on left side; it is not yet loaded */ 616 { /* constant on left side; it is not yet loaded */
617 if (plnge1(hier, lval2)) 617 if (plnge1(hier, lval2))
@@ -632,7 +632,7 @@ plnge2(void (*oper) (void),
632 if (commutative(oper)) 632 if (commutative(oper))
633 { /* test for commutative operators */ 633 { /* test for commutative operators */
634 value lvaltmp = { NULL, 0, 0, 0, 0, NULL }; 634 value lvaltmp = { NULL, 0, 0, 0, 0, NULL };
635 stgdel(index, cidx); /* scratch push1() and constant fetch (then 635 stgdel(idx, cidx); /* scratch push1() and constant fetch (then
636 * fetch the constant again */ 636 * fetch the constant again */
637 const2(lval2->constval << dbltest(oper, lval1, lval2)); 637 const2(lval2->constval << dbltest(oper, lval1, lval2));
638 /* now, the primary register has the left operand and the secondary 638 /* now, the primary register has the left operand and the secondary
@@ -693,7 +693,7 @@ plnge2(void (*oper) (void),
693 else if (lval1->ident == iCONSTEXPR && lval2->ident == iCONSTEXPR) 693 else if (lval1->ident == iCONSTEXPR && lval2->ident == iCONSTEXPR)
694 { 694 {
695 /* only constant expression if both constant */ 695 /* only constant expression if both constant */
696 stgdel(index, cidx); /* scratch generated code and calculate */ 696 stgdel(idx, cidx); /* scratch generated code and calculate */
697 if (!matchtag(lval1->tag, lval2->tag, FALSE)) 697 if (!matchtag(lval1->tag, lval2->tag, FALSE))
698 error(213); /* tagname mismatch */ 698 error(213); /* tagname mismatch */
699 lval1->constval = 699 lval1->constval =
@@ -1483,7 +1483,7 @@ hier2(value * lval)
1483static int 1483static int
1484hier1(value * lval1) 1484hier1(value * lval1)
1485{ 1485{
1486 int lvalue, index, tok, symtok; 1486 int lvalue, idx, tok, symtok;
1487 cell val, cidx; 1487 cell val, cidx;
1488 value lval2 = { NULL, 0, 0, 0, 0, NULL }; 1488 value lval2 = { NULL, 0, 0, 0, 0, NULL };
1489 char *st; 1489 char *st;
@@ -1527,7 +1527,7 @@ hier1(value * lval1)
1527 needtoken(close); 1527 needtoken(close);
1528 return FALSE; 1528 return FALSE;
1529 } /* if */ 1529 } /* if */
1530 stgget(&index, &cidx); /* mark position in code generator */ 1530 stgget(&idx, &cidx); /* mark position in code generator */
1531 push1(); /* save base address of the array */ 1531 push1(); /* save base address of the array */
1532 if (hier14(&lval2)) /* create expression for the array index */ 1532 if (hier14(&lval2)) /* create expression for the array index */
1533 rvalue(&lval2); 1533 rvalue(&lval2);
@@ -1538,7 +1538,7 @@ hier1(value * lval1)
1538 error(213); 1538 error(213);
1539 if (lval2.ident == iCONSTEXPR) 1539 if (lval2.ident == iCONSTEXPR)
1540 { /* constant expression */ 1540 { /* constant expression */
1541 stgdel(index, cidx); /* scratch generated code */ 1541 stgdel(idx, cidx); /* scratch generated code */
1542 if (lval1->arrayidx) 1542 if (lval1->arrayidx)
1543 { /* keep constant index, for checking */ 1543 { /* keep constant index, for checking */
1544 assert(sym->dim.array.level >= 0 1544 assert(sym->dim.array.level >= 0
@@ -2365,7 +2365,7 @@ commutative(void (*oper) ())
2365static int 2365static int
2366constant(value * lval) 2366constant(value * lval)
2367{ 2367{
2368 int tok, index, constant; 2368 int tok, idx, constant;
2369 cell val, item, cidx; 2369 cell val, item, cidx;
2370 char *st; 2370 char *st;
2371 symbol *sym; 2371 symbol *sym;
@@ -2413,9 +2413,9 @@ constant(value * lval)
2413 /* cannot call constexpr() here, because "staging" is already turned 2413 /* cannot call constexpr() here, because "staging" is already turned
2414 * on at this point */ 2414 * on at this point */
2415 assert(staging); 2415 assert(staging);
2416 stgget(&index, &cidx); /* mark position in code generator */ 2416 stgget(&idx, &cidx); /* mark position in code generator */
2417 expression(&constant, &item, &tag, FALSE); 2417 expression(&constant, &item, &tag, FALSE);
2418 stgdel(index, cidx); /* scratch generated code */ 2418 stgdel(idx, cidx); /* scratch generated code */
2419 if (constant == 0) 2419 if (constant == 0)
2420 error(8); /* must be constant expression */ 2420 error(8); /* must be constant expression */
2421 if (lasttag < 0) 2421 if (lasttag < 0)
diff --git a/legacy/embryo/src/bin/embryo_cc_sc4.c b/src/bin/embryo/embryo_cc_sc4.c
index 258d714228..1d4a321bd0 100644
--- a/legacy/embryo/src/bin/embryo_cc_sc4.c
+++ b/src/bin/embryo/embryo_cc_sc4.c
@@ -32,6 +32,8 @@
32#include <limits.h> /* for PATH_MAX */ 32#include <limits.h> /* for PATH_MAX */
33#include <string.h> 33#include <string.h>
34 34
35#include <Eina.h>
36
35#include "embryo_cc_sc.h" 37#include "embryo_cc_sc.h"
36 38
37/* When a subroutine returns to address 0, the AMX must halt. In earlier 39/* When a subroutine returns to address 0, the AMX must halt. In earlier
@@ -216,7 +218,7 @@ endexpr(int fullexpr)
216 * Global references: funcstatus (referred to only) 218 * Global references: funcstatus (referred to only)
217 */ 219 */
218void 220void
219startfunc(char *fname __UNUSED__) 221startfunc(char *fname EINA_UNUSED)
220{ 222{
221 stgwrite("\tproc"); 223 stgwrite("\tproc");
222 stgwrite("\n"); 224 stgwrite("\n");
diff --git a/legacy/embryo/src/bin/embryo_cc_sc5.c b/src/bin/embryo/embryo_cc_sc5.c
index a8af498724..f284420bb3 100644
--- a/legacy/embryo/src/bin/embryo_cc_sc5.c
+++ b/src/bin/embryo/embryo_cc_sc5.c
@@ -36,6 +36,8 @@
36# include <unistd.h> 36# include <unistd.h>
37#endif 37#endif
38 38
39#include <Eina.h>
40
39#include "embryo_cc_sc.h" 41#include "embryo_cc_sc.h"
40#include "embryo_cc_sc5.scp" 42#include "embryo_cc_sc5.scp"
41 43
diff --git a/legacy/embryo/src/bin/embryo_cc_sc5.scp b/src/bin/embryo/embryo_cc_sc5.scp
index bf0a606dc8..bf0a606dc8 100644
--- a/legacy/embryo/src/bin/embryo_cc_sc5.scp
+++ b/src/bin/embryo/embryo_cc_sc5.scp
diff --git a/legacy/embryo/src/bin/embryo_cc_sc6.c b/src/bin/embryo/embryo_cc_sc6.c
index 3525d27da5..20c4122faf 100644
--- a/legacy/embryo/src/bin/embryo_cc_sc6.c
+++ b/src/bin/embryo/embryo_cc_sc6.c
@@ -31,6 +31,9 @@
31#include <stdlib.h> /* for macro max() */ 31#include <stdlib.h> /* for macro max() */
32#include <string.h> 32#include <string.h>
33#include <ctype.h> 33#include <ctype.h>
34
35#include <Eina.h>
36
34#include "embryo_cc_sc.h" 37#include "embryo_cc_sc.h"
35 38
36typedef cell(*OPCODE_PROC) (FILE * fbin, char *params, cell opcode); 39typedef cell(*OPCODE_PROC) (FILE * fbin, char *params, cell opcode);
@@ -164,31 +167,31 @@ write_encoded(FILE * fbin, ucell * c, int num)
164 ucell p = (ucell) * c; 167 ucell p = (ucell) * c;
165 unsigned char t[5]; /* a 32-bit cell is encoded in max. 5 bytes (3 bytes for a 16-bit cell) */ 168 unsigned char t[5]; /* a 32-bit cell is encoded in max. 5 bytes (3 bytes for a 16-bit cell) */
166 unsigned char code; 169 unsigned char code;
167 int index; 170 int idx;
168 171
169 for (index = 0; index < 5; index++) 172 for (idx = 0; idx < 5; idx++)
170 { 173 {
171 t[index] = (unsigned char)(p & 0x7f); /* store 7 bits */ 174 t[idx] = (unsigned char)(p & 0x7f); /* store 7 bits */
172 p >>= 7; 175 p >>= 7;
173 } /* for */ 176 } /* for */
174 /* skip leading zeros */ 177 /* skip leading zeros */
175 while (index > 1 && t[index - 1] == 0 178 while (idx > 1 && t[idx - 1] == 0
176 && (t[index - 2] & 0x40) == 0) 179 && (t[idx - 2] & 0x40) == 0)
177 index--; 180 idx--;
178 /* skip leading -1s *//* ??? for BIT16, check for index==3 && t[index-1]==0x03 */ 181 /* skip leading -1s *//* ??? for BIT16, check for idx==3 && t[idx-1]==0x03 */
179 if (index == 5 && t[index - 1] == 0x0f 182 if (idx == 5 && t[idx - 1] == 0x0f
180 && (t[index - 2] & 0x40) != 0) 183 && (t[idx - 2] & 0x40) != 0)
181 index--; 184 idx--;
182 while (index > 1 && t[index - 1] == 0x7f 185 while (idx > 1 && t[idx - 1] == 0x7f
183 && (t[index - 2] & 0x40) != 0) 186 && (t[idx - 2] & 0x40) != 0)
184 index--; 187 idx--;
185 /* write high byte first, write continuation bits */ 188 /* write high byte first, write continuation bits */
186 assert(index > 0); 189 assert(idx > 0);
187 while (index-- > 0) 190 while (idx-- > 0)
188 { 191 {
189 code = 192 code =
190 (unsigned char)((index == 0) ? t[index] 193 (unsigned char)((idx == 0) ? t[idx]
191 : (t[index] | 0x80)); 194 : (t[idx] | 0x80));
192 writeerror |= !sc_writebin(fbin, &code, 1); 195 writeerror |= !sc_writebin(fbin, &code, 1);
193 bytes_out++; 196 bytes_out++;
194 } /* while */ 197 } /* while */
@@ -211,7 +214,7 @@ write_encoded(FILE * fbin, ucell * c, int num)
211#endif 214#endif
212 215
213static cell 216static cell
214noop(FILE * fbin __UNUSED__, char *params __UNUSED__, cell opcode __UNUSED__) 217noop(FILE * fbin EINA_UNUSED, char *params EINA_UNUSED, cell opcode EINA_UNUSED)
215{ 218{
216 return 0; 219 return 0;
217} 220}
@@ -221,7 +224,7 @@ noop(FILE * fbin __UNUSED__, char *params __UNUSED__, cell opcode __UNUSED__)
221#endif 224#endif
222 225
223static cell 226static cell
224parm0(FILE * fbin, char *params __UNUSED__, cell opcode) 227parm0(FILE * fbin, char *params EINA_UNUSED, cell opcode)
225{ 228{
226 if (fbin) 229 if (fbin)
227 write_encoded(fbin, (ucell *) & opcode, 1); 230 write_encoded(fbin, (ucell *) & opcode, 1);
@@ -261,7 +264,7 @@ parm2(FILE * fbin, char *params, cell opcode)
261#endif 264#endif
262 265
263static cell 266static cell
264do_dump(FILE * fbin, char *params, cell opcode __UNUSED__) 267do_dump(FILE * fbin, char *params, cell opcode EINA_UNUSED)
265{ 268{
266 ucell p; 269 ucell p;
267 int num = 0; 270 int num = 0;
@@ -427,7 +430,7 @@ do_switch(FILE * fbin, char *params, cell opcode)
427#endif 430#endif
428 431
429static cell 432static cell
430do_case(FILE * fbin, char *params, cell opcode __UNUSED__) 433do_case(FILE * fbin, char *params, cell opcode EINA_UNUSED)
431{ 434{
432 int i; 435 int i;
433 ucell p, v; 436 ucell p, v;
@@ -451,7 +454,7 @@ do_case(FILE * fbin, char *params, cell opcode __UNUSED__)
451#endif 454#endif
452 455
453static cell 456static cell
454curfile(FILE * fbin __UNUSED__, char *params, cell opcode __UNUSED__) 457curfile(FILE * fbin EINA_UNUSED, char *params, cell opcode EINA_UNUSED)
455{ 458{
456 fcurrent = (int)hex2long(params, NULL); 459 fcurrent = (int)hex2long(params, NULL);
457 return 0; 460 return 0;
diff --git a/legacy/embryo/src/bin/embryo_cc_sc7.c b/src/bin/embryo/embryo_cc_sc7.c
index b51f2ea9c4..f18302d229 100644
--- a/legacy/embryo/src/bin/embryo_cc_sc7.c
+++ b/src/bin/embryo/embryo_cc_sc7.c
@@ -204,12 +204,12 @@ stgwrite(char *st)
204 * staging (referred to only) 204 * staging (referred to only)
205 */ 205 */
206void 206void
207stgout(int index) 207stgout(int idx)
208{ 208{
209 if (!staging) 209 if (!staging)
210 return; 210 return;
211 stgstring(&stgbuf[index], &stgbuf[stgidx]); 211 stgstring(&stgbuf[idx], &stgbuf[stgidx]);
212 stgidx = index; 212 stgidx = idx;
213} 213}
214 214
215typedef struct 215typedef struct
@@ -319,21 +319,21 @@ stgstring(char *start, char *end)
319 * staging (referred to only) 319 * staging (referred to only)
320 */ 320 */
321void 321void
322stgdel(int index, cell code_index) 322stgdel(int idx, cell code_index)
323{ 323{
324 if (staging) 324 if (staging)
325 { 325 {
326 stgidx = index; 326 stgidx = idx;
327 code_idx = code_index; 327 code_idx = code_index;
328 } /* if */ 328 } /* if */
329} 329}
330 330
331int 331int
332stgget(int *index, cell * code_index) 332stgget(int *idx, cell * code_index)
333{ 333{
334 if (staging) 334 if (staging)
335 { 335 {
336 *index = stgidx; 336 *idx = stgidx;
337 *code_index = code_idx; 337 *code_index = code_idx;
338 } /* if */ 338 } /* if */
339 return staging; 339 return staging;
diff --git a/legacy/embryo/src/bin/embryo_cc_sc7.scp b/src/bin/embryo/embryo_cc_sc7.scp
index 38f784d3cc..38f784d3cc 100644
--- a/legacy/embryo/src/bin/embryo_cc_sc7.scp
+++ b/src/bin/embryo/embryo_cc_sc7.scp
diff --git a/legacy/embryo/src/bin/embryo_cc_scexpand.c b/src/bin/embryo/embryo_cc_scexpand.c
index 6ab34a17a5..6ab34a17a5 100644
--- a/legacy/embryo/src/bin/embryo_cc_scexpand.c
+++ b/src/bin/embryo/embryo_cc_scexpand.c
diff --git a/legacy/embryo/src/bin/embryo_cc_sclist.c b/src/bin/embryo/embryo_cc_sclist.c
index e908248066..68a4c30d58 100644
--- a/legacy/embryo/src/bin/embryo_cc_sclist.c
+++ b/src/bin/embryo/embryo_cc_sclist.c
@@ -185,12 +185,12 @@ insert_path(char *path)
185 return cur; 185 return cur;
186} 186}
187 187
188char * 188char *
189get_path(int index) 189get_path(int idx)
190{ 190{
191 stringlist *cur = includepaths.next; 191 stringlist *cur = includepaths.next;
192 192
193 while (cur && index-- > 0) 193 while (cur && idx-- > 0)
194 cur = cur->next; 194 cur = cur->next;
195 if (cur) 195 if (cur)
196 { 196 {
diff --git a/legacy/embryo/src/bin/embryo_cc_scvars.c b/src/bin/embryo/embryo_cc_scvars.c
index f369b9b928..f369b9b928 100644
--- a/legacy/embryo/src/bin/embryo_cc_scvars.c
+++ b/src/bin/embryo/embryo_cc_scvars.c
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 755365ab10..3fe99e9629 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -8,4 +8,4 @@ SUBDIRS += evil
8 8
9endif 9endif
10 10
11SUBDIRS += eina eo eet 11SUBDIRS += eina eo eet embryo
diff --git a/legacy/embryo/src/lib/Embryo.h b/src/lib/embryo/Embryo.h
index 650aa83555..650aa83555 100644
--- a/legacy/embryo/src/lib/Embryo.h
+++ b/src/lib/embryo/Embryo.h
diff --git a/src/lib/embryo/Makefile.am b/src/lib/embryo/Makefile.am
new file mode 100644
index 0000000000..46fa323e8f
--- /dev/null
+++ b/src/lib/embryo/Makefile.am
@@ -0,0 +1,38 @@
1
2MAINTAINERCLEANFILES = Makefile.in
3
4AM_CPPFLAGS = \
5-I$(top_srcdir)/src/lib/eina \
6-I$(top_builddir)/src/lib/eina \
7-DPACKAGE_BIN_DIR=\"$(bindir)\" \
8-DPACKAGE_LIB_DIR=\"$(libdir)\" \
9-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
10-DEFL_EMBRYO_BUILD \
11@EFL_CFLAGS@
12
13if HAVE_WINDOWS
14AM_CPPFLAGS += \
15-I$(top_srcdir)/src/lib/evil \
16-I$(top_builddir)/src/lib/evil
17endif
18
19includes_HEADERS = Embryo.h
20includesdir = $(includedir)/embryo-@VMAJ@
21
22lib_LTLIBRARIES = libembryo.la
23
24libembryo_la_SOURCES = \
25embryo_amx.c \
26embryo_args.c \
27embryo_float.c \
28embryo_main.c \
29embryo_rand.c \
30embryo_str.c \
31embryo_time.c \
32embryo_private.h
33
34libembryo_la_LIBADD = $(top_builddir)/src/lib/eina/libeina.la -lm
35if HAVE_WINDOWS
36libembryo_la_LIBADD += $(top_builddir)/src/lib/evil/libevil.la
37endif
38libembryo_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@
diff --git a/legacy/embryo/src/lib/embryo_amx.c b/src/lib/embryo/embryo_amx.c
index 55423b443b..13ef31b006 100644
--- a/legacy/embryo/src/lib/embryo_amx.c
+++ b/src/lib/embryo/embryo_amx.c
@@ -33,6 +33,8 @@
33# include <Exotic.h> 33# include <Exotic.h>
34#endif 34#endif
35 35
36#include <Eina.h>
37
36#include "Embryo.h" 38#include "Embryo.h"
37#include "embryo_private.h" 39#include "embryo_private.h"
38 40
@@ -450,7 +452,7 @@ embryo_program_vm_pop(Embryo_Program *ep)
450EAPI void 452EAPI void
451embryo_swap_16(unsigned short *v 453embryo_swap_16(unsigned short *v
452#ifndef WORDS_BIGENDIAN 454#ifndef WORDS_BIGENDIAN
453 __UNUSED__ 455 EINA_UNUSED
454#endif 456#endif
455 ) 457 )
456{ 458{
@@ -462,7 +464,7 @@ embryo_swap_16(unsigned short *v
462EAPI void 464EAPI void
463embryo_swap_32(unsigned int *v 465embryo_swap_32(unsigned int *v
464#ifndef WORDS_BIGENDIAN 466#ifndef WORDS_BIGENDIAN
465 __UNUSED__ 467 EINA_UNUSED
466#endif 468#endif
467 ) 469 )
468{ 470{
diff --git a/legacy/embryo/src/lib/embryo_args.c b/src/lib/embryo/embryo_args.c
index 0c0089ea7d..e9cef2bb25 100644
--- a/legacy/embryo/src/lib/embryo_args.c
+++ b/src/lib/embryo/embryo_args.c
@@ -19,6 +19,8 @@ extern "C"
19void *alloca (size_t); 19void *alloca (size_t);
20#endif 20#endif
21 21
22#include <Eina.h>
23
22#include "Embryo.h" 24#include "Embryo.h"
23#include "embryo_private.h" 25#include "embryo_private.h"
24 26
@@ -31,7 +33,7 @@ void *alloca (size_t);
31/* exported args api */ 33/* exported args api */
32 34
33static Embryo_Cell 35static Embryo_Cell
34_embryo_args_numargs(Embryo_Program *ep, Embryo_Cell *params __UNUSED__) 36_embryo_args_numargs(Embryo_Program *ep, Embryo_Cell *params EINA_UNUSED)
35{ 37{
36 Embryo_Header *hdr; 38 Embryo_Header *hdr;
37 unsigned char *data; 39 unsigned char *data;
diff --git a/legacy/embryo/src/lib/embryo_float.c b/src/lib/embryo/embryo_float.c
index ffaa87dab6..d84d73d3eb 100644
--- a/legacy/embryo/src/lib/embryo_float.c
+++ b/src/lib/embryo/embryo_float.c
@@ -44,6 +44,8 @@
44#include <stdlib.h> 44#include <stdlib.h>
45#include <math.h> 45#include <math.h>
46 46
47#include <Eina.h>
48
47#include "Embryo.h" 49#include "Embryo.h"
48#include "embryo_private.h" 50#include "embryo_private.h"
49 51
@@ -72,7 +74,7 @@ _embryo_fp_degrees_to_radians(float angle, int radix)
72/* exported float api */ 74/* exported float api */
73 75
74static Embryo_Cell 76static Embryo_Cell
75_embryo_fp(Embryo_Program *ep __UNUSED__, Embryo_Cell *params) 77_embryo_fp(Embryo_Program *ep EINA_UNUSED, Embryo_Cell *params)
76{ 78{
77 /* params[1] = long value to convert to a float */ 79 /* params[1] = long value to convert to a float */
78 float f; 80 float f;
@@ -101,7 +103,7 @@ _embryo_fp_str(Embryo_Program *ep, Embryo_Cell *params)
101} 103}
102 104
103static Embryo_Cell 105static Embryo_Cell
104_embryo_fp_mul(Embryo_Program *ep __UNUSED__, Embryo_Cell *params) 106_embryo_fp_mul(Embryo_Program *ep EINA_UNUSED, Embryo_Cell *params)
105{ 107{
106 /* params[1] = float operand 1 */ 108 /* params[1] = float operand 1 */
107 /* params[2] = float operand 2 */ 109 /* params[2] = float operand 2 */
@@ -113,7 +115,7 @@ _embryo_fp_mul(Embryo_Program *ep __UNUSED__, Embryo_Cell *params)
113} 115}
114 116
115static Embryo_Cell 117static Embryo_Cell
116_embryo_fp_div(Embryo_Program *ep __UNUSED__, Embryo_Cell *params) 118_embryo_fp_div(Embryo_Program *ep EINA_UNUSED, Embryo_Cell *params)
117{ 119{
118 /* params[1] = float dividend (top) */ 120 /* params[1] = float dividend (top) */
119 /* params[2] = float divisor (bottom) */ 121 /* params[2] = float divisor (bottom) */
@@ -136,7 +138,7 @@ _embryo_fp_div(Embryo_Program *ep __UNUSED__, Embryo_Cell *params)
136} 138}
137 139
138static Embryo_Cell 140static Embryo_Cell
139_embryo_fp_add(Embryo_Program *ep __UNUSED__, Embryo_Cell *params) 141_embryo_fp_add(Embryo_Program *ep EINA_UNUSED, Embryo_Cell *params)
140{ 142{
141 /* params[1] = float operand 1 */ 143 /* params[1] = float operand 1 */
142 /* params[2] = float operand 2 */ 144 /* params[2] = float operand 2 */
@@ -148,7 +150,7 @@ _embryo_fp_add(Embryo_Program *ep __UNUSED__, Embryo_Cell *params)
148} 150}
149 151
150static Embryo_Cell 152static Embryo_Cell
151_embryo_fp_sub(Embryo_Program *ep __UNUSED__, Embryo_Cell *params) 153_embryo_fp_sub(Embryo_Program *ep EINA_UNUSED, Embryo_Cell *params)
152{ 154{
153 /* params[1] = float operand 1 */ 155 /* params[1] = float operand 1 */
154 /* params[2] = float operand 2 */ 156 /* params[2] = float operand 2 */
@@ -161,7 +163,7 @@ _embryo_fp_sub(Embryo_Program *ep __UNUSED__, Embryo_Cell *params)
161 163
162/* Return fractional part of float */ 164/* Return fractional part of float */
163static Embryo_Cell 165static Embryo_Cell
164_embryo_fp_fract(Embryo_Program *ep __UNUSED__, Embryo_Cell *params) 166_embryo_fp_fract(Embryo_Program *ep EINA_UNUSED, Embryo_Cell *params)
165{ 167{
166 /* params[1] = float operand */ 168 /* params[1] = float operand */
167 float f; 169 float f;
@@ -174,7 +176,7 @@ _embryo_fp_fract(Embryo_Program *ep __UNUSED__, Embryo_Cell *params)
174 176
175/* Return integer part of float, rounded */ 177/* Return integer part of float, rounded */
176static Embryo_Cell 178static Embryo_Cell
177_embryo_fp_round(Embryo_Program *ep __UNUSED__, Embryo_Cell *params) 179_embryo_fp_round(Embryo_Program *ep EINA_UNUSED, Embryo_Cell *params)
178{ 180{
179 /* params[1] = float operand */ 181 /* params[1] = float operand */
180 /* params[2] = Type of rounding (cell) */ 182 /* params[2] = Type of rounding (cell) */
@@ -202,7 +204,7 @@ _embryo_fp_round(Embryo_Program *ep __UNUSED__, Embryo_Cell *params)
202} 204}
203 205
204static Embryo_Cell 206static Embryo_Cell
205_embryo_fp_cmp(Embryo_Program *ep __UNUSED__, Embryo_Cell *params) 207_embryo_fp_cmp(Embryo_Program *ep EINA_UNUSED, Embryo_Cell *params)
206{ 208{
207 /* params[1] = float operand 1 */ 209 /* params[1] = float operand 1 */
208 /* params[2] = float operand 2 */ 210 /* params[2] = float operand 2 */
@@ -234,7 +236,7 @@ _embryo_fp_sqroot(Embryo_Program *ep, Embryo_Cell *params)
234} 236}
235 237
236static Embryo_Cell 238static Embryo_Cell
237_embryo_fp_power(Embryo_Program *ep __UNUSED__, Embryo_Cell *params) 239_embryo_fp_power(Embryo_Program *ep EINA_UNUSED, Embryo_Cell *params)
238{ 240{
239 /* params[1] = float operand 1 */ 241 /* params[1] = float operand 1 */
240 /* params[2] = float operand 2 */ 242 /* params[2] = float operand 2 */
@@ -274,7 +276,7 @@ _embryo_fp_log(Embryo_Program *ep, Embryo_Cell *params)
274} 276}
275 277
276static Embryo_Cell 278static Embryo_Cell
277_embryo_fp_sin(Embryo_Program *ep __UNUSED__, Embryo_Cell *params) 279_embryo_fp_sin(Embryo_Program *ep EINA_UNUSED, Embryo_Cell *params)
278{ 280{
279 /* params[1] = float operand 1 (angle) */ 281 /* params[1] = float operand 1 (angle) */
280 /* params[2] = float operand 2 (radix) */ 282 /* params[2] = float operand 2 (radix) */
@@ -288,7 +290,7 @@ _embryo_fp_sin(Embryo_Program *ep __UNUSED__, Embryo_Cell *params)
288} 290}
289 291
290static Embryo_Cell 292static Embryo_Cell
291_embryo_fp_cos(Embryo_Program *ep __UNUSED__, Embryo_Cell *params) 293_embryo_fp_cos(Embryo_Program *ep EINA_UNUSED, Embryo_Cell *params)
292{ 294{
293 /* params[1] = float operand 1 (angle) */ 295 /* params[1] = float operand 1 (angle) */
294 /* params[2] = float operand 2 (radix) */ 296 /* params[2] = float operand 2 (radix) */
@@ -302,7 +304,7 @@ _embryo_fp_cos(Embryo_Program *ep __UNUSED__, Embryo_Cell *params)
302} 304}
303 305
304static Embryo_Cell 306static Embryo_Cell
305_embryo_fp_tan(Embryo_Program *ep __UNUSED__, Embryo_Cell *params) 307_embryo_fp_tan(Embryo_Program *ep EINA_UNUSED, Embryo_Cell *params)
306{ 308{
307 /* params[1] = float operand 1 (angle) */ 309 /* params[1] = float operand 1 (angle) */
308 /* params[2] = float operand 2 (radix) */ 310 /* params[2] = float operand 2 (radix) */
@@ -316,7 +318,7 @@ _embryo_fp_tan(Embryo_Program *ep __UNUSED__, Embryo_Cell *params)
316} 318}
317 319
318static Embryo_Cell 320static Embryo_Cell
319_embryo_fp_abs(Embryo_Program *ep __UNUSED__, Embryo_Cell *params) 321_embryo_fp_abs(Embryo_Program *ep EINA_UNUSED, Embryo_Cell *params)
320{ 322{
321 /* params[1] = float operand */ 323 /* params[1] = float operand */
322 float f; 324 float f;
@@ -328,7 +330,7 @@ _embryo_fp_abs(Embryo_Program *ep __UNUSED__, Embryo_Cell *params)
328} 330}
329 331
330static Embryo_Cell 332static Embryo_Cell
331_embryo_fp_asin(Embryo_Program *ep __UNUSED__, Embryo_Cell *params) 333_embryo_fp_asin(Embryo_Program *ep EINA_UNUSED, Embryo_Cell *params)
332{ 334{
333 /* params[1] = float operand 1 (angle) */ 335 /* params[1] = float operand 1 (angle) */
334 /* params[2] = float operand 2 (radix) */ 336 /* params[2] = float operand 2 (radix) */
@@ -342,7 +344,7 @@ _embryo_fp_asin(Embryo_Program *ep __UNUSED__, Embryo_Cell *params)
342} 344}
343 345
344static Embryo_Cell 346static Embryo_Cell
345_embryo_fp_acos(Embryo_Program *ep __UNUSED__, Embryo_Cell *params) 347_embryo_fp_acos(Embryo_Program *ep EINA_UNUSED, Embryo_Cell *params)
346{ 348{
347 /* params[1] = float operand 1 (angle) */ 349 /* params[1] = float operand 1 (angle) */
348 /* params[2] = float operand 2 (radix) */ 350 /* params[2] = float operand 2 (radix) */
@@ -356,7 +358,7 @@ _embryo_fp_acos(Embryo_Program *ep __UNUSED__, Embryo_Cell *params)
356} 358}
357 359
358static Embryo_Cell 360static Embryo_Cell
359_embryo_fp_atan(Embryo_Program *ep __UNUSED__, Embryo_Cell *params) 361_embryo_fp_atan(Embryo_Program *ep EINA_UNUSED, Embryo_Cell *params)
360{ 362{
361 /* params[1] = float operand 1 (angle) */ 363 /* params[1] = float operand 1 (angle) */
362 /* params[2] = float operand 2 (radix) */ 364 /* params[2] = float operand 2 (radix) */
@@ -370,7 +372,7 @@ _embryo_fp_atan(Embryo_Program *ep __UNUSED__, Embryo_Cell *params)
370} 372}
371 373
372static Embryo_Cell 374static Embryo_Cell
373_embryo_fp_atan2(Embryo_Program *ep __UNUSED__, Embryo_Cell *params) 375_embryo_fp_atan2(Embryo_Program *ep EINA_UNUSED, Embryo_Cell *params)
374{ 376{
375 /* params[1] = float operand 1 (y) */ 377 /* params[1] = float operand 1 (y) */
376 /* params[2] = float operand 2 (x) */ 378 /* params[2] = float operand 2 (x) */
@@ -386,7 +388,7 @@ _embryo_fp_atan2(Embryo_Program *ep __UNUSED__, Embryo_Cell *params)
386} 388}
387 389
388static Embryo_Cell 390static Embryo_Cell
389_embryo_fp_log1p(Embryo_Program *ep __UNUSED__, Embryo_Cell *params) 391_embryo_fp_log1p(Embryo_Program *ep EINA_UNUSED, Embryo_Cell *params)
390{ 392{
391 /* params[1] = float operand */ 393 /* params[1] = float operand */
392 float f; 394 float f;
@@ -398,7 +400,7 @@ _embryo_fp_log1p(Embryo_Program *ep __UNUSED__, Embryo_Cell *params)
398} 400}
399 401
400static Embryo_Cell 402static Embryo_Cell
401_embryo_fp_cbrt(Embryo_Program *ep __UNUSED__, Embryo_Cell *params) 403_embryo_fp_cbrt(Embryo_Program *ep EINA_UNUSED, Embryo_Cell *params)
402{ 404{
403 /* params[1] = float operand */ 405 /* params[1] = float operand */
404 float f; 406 float f;
@@ -410,7 +412,7 @@ _embryo_fp_cbrt(Embryo_Program *ep __UNUSED__, Embryo_Cell *params)
410} 412}
411 413
412static Embryo_Cell 414static Embryo_Cell
413_embryo_fp_exp(Embryo_Program *ep __UNUSED__, Embryo_Cell *params) 415_embryo_fp_exp(Embryo_Program *ep EINA_UNUSED, Embryo_Cell *params)
414{ 416{
415 /* params[1] = float operand */ 417 /* params[1] = float operand */
416 float f; 418 float f;
@@ -422,7 +424,7 @@ _embryo_fp_exp(Embryo_Program *ep __UNUSED__, Embryo_Cell *params)
422} 424}
423 425
424static Embryo_Cell 426static Embryo_Cell
425_embryo_fp_exp2(Embryo_Program *ep __UNUSED__, Embryo_Cell *params) 427_embryo_fp_exp2(Embryo_Program *ep EINA_UNUSED, Embryo_Cell *params)
426{ 428{
427 /* params[1] = float operand */ 429 /* params[1] = float operand */
428 float f; 430 float f;
@@ -434,7 +436,7 @@ _embryo_fp_exp2(Embryo_Program *ep __UNUSED__, Embryo_Cell *params)
434} 436}
435 437
436static Embryo_Cell 438static Embryo_Cell
437_embryo_fp_hypot(Embryo_Program *ep __UNUSED__, Embryo_Cell *params) 439_embryo_fp_hypot(Embryo_Program *ep EINA_UNUSED, Embryo_Cell *params)
438{ 440{
439 /* params[1] = float operand */ 441 /* params[1] = float operand */
440 float f, ff; 442 float f, ff;
diff --git a/legacy/embryo/src/lib/embryo_main.c b/src/lib/embryo/embryo_main.c
index 3c57ec7c37..3c57ec7c37 100644
--- a/legacy/embryo/src/lib/embryo_main.c
+++ b/src/lib/embryo/embryo_main.c
diff --git a/legacy/embryo/src/lib/embryo_private.h b/src/lib/embryo/embryo_private.h
index a4205e1708..c65a1abfe5 100644
--- a/legacy/embryo/src/lib/embryo_private.h
+++ b/src/lib/embryo/embryo_private.h
@@ -1,14 +1,6 @@
1#ifndef _EMBRYO_PRIVATE_H 1#ifndef _EMBRYO_PRIVATE_H
2#define _EMBRYO_PRIVATE_H 2#define _EMBRYO_PRIVATE_H
3 3
4
5#ifdef __GNUC__
6# if __GNUC__ >= 4
7// BROKEN in gcc 4 on amd64
8//# pragma GCC visibility push(hidden)
9# endif
10#endif
11
12typedef enum _Embryo_Opcode Embryo_Opcode; 4typedef enum _Embryo_Opcode Embryo_Opcode;
13 5
14enum _Embryo_Opcode 6enum _Embryo_Opcode
diff --git a/legacy/embryo/src/lib/embryo_rand.c b/src/lib/embryo/embryo_rand.c
index 627f7ed35c..0f13d87127 100644
--- a/legacy/embryo/src/lib/embryo_rand.c
+++ b/src/lib/embryo/embryo_rand.c
@@ -4,19 +4,21 @@
4 4
5#include <stdlib.h> 5#include <stdlib.h>
6 6
7#include <Eina.h>
8
7#include "Embryo.h" 9#include "Embryo.h"
8#include "embryo_private.h" 10#include "embryo_private.h"
9 11
10/* exported random number api */ 12/* exported random number api */
11 13
12static Embryo_Cell 14static Embryo_Cell
13_embryo_rand_rand(Embryo_Program *ep __UNUSED__, Embryo_Cell *params __UNUSED__) 15_embryo_rand_rand(Embryo_Program *ep EINA_UNUSED, Embryo_Cell *params EINA_UNUSED)
14{ 16{
15 return (Embryo_Cell)(rand() & 0xffff); 17 return (Embryo_Cell)(rand() & 0xffff);
16} 18}
17 19
18static Embryo_Cell 20static Embryo_Cell
19_embryo_rand_randf(Embryo_Program *ep __UNUSED__, Embryo_Cell *params __UNUSED__) 21_embryo_rand_randf(Embryo_Program *ep EINA_UNUSED, Embryo_Cell *params EINA_UNUSED)
20{ 22{
21 double r; 23 double r;
22 float f; 24 float f;
diff --git a/legacy/embryo/src/lib/embryo_str.c b/src/lib/embryo/embryo_str.c
index 0c2faa2d15..0c2faa2d15 100644
--- a/legacy/embryo/src/lib/embryo_str.c
+++ b/src/lib/embryo/embryo_str.c
diff --git a/legacy/embryo/src/lib/embryo_time.c b/src/lib/embryo/embryo_time.c
index 90c14cfd89..8725377b0c 100644
--- a/legacy/embryo/src/lib/embryo_time.c
+++ b/src/lib/embryo/embryo_time.c
@@ -2,10 +2,6 @@
2# include "config.h" 2# include "config.h"
3#endif 3#endif
4 4
5#ifndef EFL_HAVE_GETTIMEOFDAY
6# error "Your platform isn't supported yet"
7#endif
8
9#include <sys/time.h> 5#include <sys/time.h>
10#include <time.h> 6#include <time.h>
11 7
@@ -21,13 +17,15 @@
21# include <Exotic.h> 17# include <Exotic.h>
22#endif 18#endif
23 19
20#include <Eina.h>
21
24#include "Embryo.h" 22#include "Embryo.h"
25#include "embryo_private.h" 23#include "embryo_private.h"
26 24
27/* exported time api */ 25/* exported time api */
28 26
29static Embryo_Cell 27static Embryo_Cell
30_embryo_time_seconds(Embryo_Program *ep __UNUSED__, Embryo_Cell *params __UNUSED__) 28_embryo_time_seconds(Embryo_Program *ep EINA_UNUSED, Embryo_Cell *params EINA_UNUSED)
31{ 29{
32 struct timeval timev; 30 struct timeval timev;
33 double t; 31 double t;