Moved callbacks to ZIPR functionality

.gitattributes

 * text=auto !eol
 /Makefile -text
-cgc_callbacks/Makefile.in -text
-cgc_callbacks/configure -text
-cgc_callbacks/configure.in -text
-cgc_callbacks/example/Makefile.in -text
-cgc_callbacks/example/callback.c -text
-cgc_callbacks/lib/Makefile.in -text
-cgc_callbacks/lib/crt.s -text
-cgc_callbacks/libc/Makefile.in -text
-cgc_callbacks/libc/include/cgc.h -text
-cgc_callbacks/libc/include/malloc.h -text
-cgc_callbacks/libc/include/stdint.h -text
-cgc_callbacks/libc/include/stdlib.h -text
-cgc_callbacks/libc/include/unistd.h -text
-cgc_callbacks/libc/src/Makefile.in -text
-cgc_callbacks/libc/src/cgc.s -text
-cgc_callbacks/libc/src/malloc.c -text
-cgc_callbacks/libc/src/unistd.c -text
+callbacks/Makefile.in -text
+callbacks/configure -text
+callbacks/configure.in -text
+callbacks/example/Makefile.in -text
+callbacks/example/callback.c -text
+callbacks/lib/Makefile.in -text
+callbacks/lib/crt.s -text
+callbacks/libc/Makefile.in -text
+callbacks/libc/include/cgc.h -text
+callbacks/libc/include/malloc.h -text
+callbacks/libc/include/stdint.h -text
+callbacks/libc/include/stdlib.h -text
+callbacks/libc/include/syscall.h -text
+callbacks/libc/include/unistd.h -text
+callbacks/libc/src/Makefile.in -text
+callbacks/libc/src/cgc.s -text
+callbacks/libc/src/malloc.c -text
+callbacks/libc/src/unistd.c -text
 include/range.h -text
 include/unresolved.h -text
 include/zipr.h -text

cgc_callbacks/configure.in → callbacks/configure.in

@@ -4,8 +4,9 @@ AC_INIT(myconfig, version-0.1)
 AC_PROG_CC
 
 AC_ARG_ENABLE([debugging],              [  --enable-debugging                enable -g when compiling])
-#AC_ARG_ENABLE([example],              [  --enable-debugging                enable -g when compiling])
-#AC_ARG_ENABLE([libc],              [  --enable-libc                enable $1 for building ])
+AC_ARG_ENABLE([cgc],              	[  --enable-cgc                enable -DCGC when compiling for CGC binaries])
+#AC_ARG_ENABLE([example],              	[  --enable-debugging                enable -g when compiling])
+#AC_ARG_ENABLE([libc],              	[  --enable-libc                enable $1 for building ])
 
 OPTIMIZE="-O3"
 if test "$enable_debugging" = yes; then
@@ -34,16 +35,22 @@ enable_dir()
 	fi
 }
 
-LIB=$PEASOUP_HOME/cgc_callbacks/lib/callbacks.a
+LIB=$ZIPR_HOME/callbacks/lib/callbacks.a
 AR=ar
 CC=gcc
-CFLAGS="$OPTIMIZE -nostdinc -fPIC -I$PEASOUP_HOME/cgc_callbacks/libc/include "
+CFLAGS="$OPTIMIZE -nostdinc -fPIC -I$ZIPR_HOME/callbacks/libc/include  -fno-stack-protector"
 LD=gcc
 LDFLAGS="-r -nostdlib -fPIC"
 AS=nasm
 ASFLAGS="-felf"
 
 
+if test "$enable_cgc" = yes; then
+	echo Enabling CGC build.
+	CFLAGS="$CFLAGS -DCGC"
+	ASFLAGS="$ASFLAGS -DCGC"
+fi
+
 # output lib's makefile, which is always needed.
 AC_OUTPUT(lib/Makefile)
 

callbacks/libc/include/syscall.h

+
+#define SYS_write 4

cgc_callbacks/libc/src/cgc.s → callbacks/libc/src/cgc.s

+%ifdef CGC
 section .text
 
 
@@ -112,3 +113,24 @@ cgc_random:
 	pop    ebx
 	ret    
 
+%else
+
+global syscall
+syscall:
+	push   edi
+	push   esi
+	push   ebx
+	mov    edi, [esp+0x24]
+	mov    esi, [esp+0x20]
+	mov    edx, [esp+0x1c]
+	mov    ecx, [esp+0x18]
+	mov    ebx, [esp+0x14]
+	mov    eax, [esp+0x10]
+	int    0x80
+	pop    ebx
+	pop    esi
+	pop    edi
+	ret    
+
+
+%endif

cgc_callbacks/libc/src/malloc.c → callbacks/libc/src/malloc.c

@@ -3,8 +3,11 @@
 
 void *malloc(size_t size)
 {
+#ifdef CGC
 	void* ret=0;
 	if(cgc_allocate(size, FALSE, &ret));
 		return ret;
 	return NULL;
+#else
+#endif
 }

cgc_callbacks/libc/src/unistd.c → callbacks/libc/src/unistd.c

 #include <unistd.h>
+#include <syscall.h>
 
 ssize_t write(int fd, const void* buf, size_t count)
 {
+#ifdef CGC
 	ssize_t ret=0;
 	cgc_transmit(fd,buf,count,&ret);
 	return ret;
+#else
+	syscall(SYS_write,fd,buf,count);
+#endif
 	
 }