cooker updates spilling all over the place

Only tangentially related:

- make seitan C99 again, so that I can build cooker without warnings

- make Makefiles make use of the usual conventions about assigning
  directory paths in variables, drop numbers.h as requirement for
  cooker and make it convenient to run stand-alone Makefiles

- fix up nr_syscalls.sh to be POSIX, otherwise it will give syntax
  errors on my system

- define a single, common way to refer to offsets in gluten, and
  functions to use those offsets in a safe way. Immediates are gone:
  cooker will write any bit of "data" to the read-only section

- call const what has to be const

- define on-disk layout for gluten

- add OP_NR (to check syscall numbers), rename OP_COPY_ARGS to
  OP_LOAD (it loads _selected_ stuff from arguments)

As for cooker itself:

- drop ARG_ and arg_ prefixes from struct names, and similar

- add/rework functions to build OP_NR, OP_LOAD, OP_CMP, and to
  write constant data to gluten

- add parsing for "compound" arguments, but that's not completely
  hooked into evaluation for numeric arguments yet

Signed-off-by: Stefano Brivio <sbrivio@redhat.com>

1 files changed, 18 insertions, 10 deletions

diff --git a/cooker/gluten.h b/cooker/gluten.h
index 440029d..a48cd6d 100644
--- a/cooker/gluten.h
+++ b/cooker/gluten.h
@@ -6,22 +6,27 @@
 #ifndef GLUTEN_H
 #define GLUTEN_H
 
+#define COOKER
+#include <gluten.h>
+
 struct gluten_arg_data {
-	int offset;
+	struct gluten_offset offset;
 	size_t len;
 };
 
 struct gluten_ref_data {
-	int name;
-	int offset;
+	char name[REF_NAMEMAX];
+	struct gluten_offset offset;
 	size_t len;
 };
 
 struct gluten_ctx {
-	int ip;
-	int lr;
-	int sp;
-	char *gluten;
+	struct gluten_offset ip;
+	struct gluten_offset lr;
+	struct gluten_offset cp;
+	struct gluten_offset dp;
+
+	struct gluten g;
 
 	struct gluten_arg_data match_dst[CALL_ARGS];
 	struct gluten_arg_data call_src[CALL_ARGS];
@@ -29,8 +34,11 @@ struct gluten_ctx {
 	struct gluten_ref_data refs[REFS_MAX];
 };
 
-int gluten_alloc(struct gluten_ctx *g, size_t size);
-int gluten_alloc_type(struct gluten_ctx *g, enum arg_type type);
-int gluten_init(struct gluten_ctx *g);
+struct gluten_offset gluten_alloc(struct gluten_ctx *g, size_t size);
+struct gluten_offset gluten_alloc_type(struct gluten_ctx *g, enum type type);
+void gluten_init(struct gluten_ctx *g);
+void gluten_block_init(struct gluten_ctx *g);
+
+extern size_t gluten_size[TYPE_COUNT];
 
 #endif /* GLUTEN_H */