Merge branch 'master' of github.com:seckcoder/csapp

Author: seckcoder

assembly/Makefile

@@ -1,4 +1,9 @@
-all:main
+all:main main.s
 
+main.s:main.c
+	gcc -m32 -g -S main.c
 main: main.c
-	gcc -g main.c -o main
+	gcc -m32 -g main.c -o main
+
+clean:
+	rm main.s main

assembly/main

@@ -1,43 +1,16 @@
 #include <stdio.h>
 
-int bar1(int x) {
-  return x;
-}
 
-int bar2(int x, int y) {
-  return x + y;
+void Gets(char *s) {
 }
 
-
-int bar3(int x, int y, int z) {
-  return x + y + z;
-}
-
-int bar4(int x, int y, int z, int w) {
-  return x + y + z + w;
-}
-
-void foo() {
-  int x = 3;
-  bar1(x);
-  int y = 4;
-  bar2(x,y);
-  int z = 5;
-  bar3(x,y,z);
-  int w = 6;
-  bar4(x,y,z,w);
-}
-
-
-void input() {
-  char s[] = "1 a 1";
-  int x,y;
-  char c;
-  int v = sscanf(s, "%d %c %d", &x,&c,&y);
-  printf("%d: %d %c %d\n", v, x,c,y);
+int getbuf() {
+  char buf[32];
+  Gets(buf);
+  return 1;
 }
 
 int main() {
-  input();
+  getbuf();
   return 0;
 }