Changeset 369

Timestamp:

07/31/06 02:28:24 (4 years ago)

Author:

vasi

Message:

faster...

Location:

icfp2006/trunk

Files:

• Makefile (modified) (2 diffs)
• um.cpp (modified) (5 diffs)

icfp2006/trunk/Makefile

@@ -1 @@
-CPPFLAGS = -Wall -O0 -g
+CCOPT = -O0 -g
+CCOPT_FAST = -fast -mcpu=7450 -mdynamic-no-pic
+DEBUG = 1
+CPPFLAGS = -Wall $(CCOPT) -DDEBUG=$(DEBUG)
 
-all: um
+
+all: opt
+
+shark: CCOPT = $(CCOPT_FAST)
+shark: um
+
+opt: DEBUG = 0
+opt: shark
 
 um: um.o
@@ -8 +18 @@
 %.o: %.cpp
         $(CXX) $(CPPFLAGS) -o $@ -c $<
+
+clean:
+        rm -f um *.o

icfp2006/trunk/um.cpp

@@ -2 +2 @@
 #include <cstdlib>
 #include <stdint.h>
+#include <sys/ioctl.h>
 #include <vector>
 using namespace std;
+
 
 typedef uint32_t platter_t;
@@ -33 +35 @@
 
 
+void check_input();
+
 void next_inst();
 void read_program(const char *fname);
@@ -60 +64 @@
         
         read_program(argv[1]);
+        #if DEBUG
+                int done = 0;
+        #endif
+        
         while (1) {
+                #if DEBUG
+                        if (done % 1000000 == 0) {
+                                fprintf(stderr, "MOps: %5d\n", done / 1000000);
+                        }
+                        ++done;
+                #endif
                 next_inst();
         }
@@ -105 +119 @@
         switch (OP) {
                 case OP_INPUT: {
-                         int c = fgetc(Infile);
-                         CREG = static_cast<platter_t>(c == EOF ? -1 : c);
-                         break;
+                        #if DEBUG
+                                check_input();
+                        #endif
+                        int c = fgetc(Infile);
+                        CREG = static_cast<platter_t>(c == EOF ? -1 : c);
+                        break;
                 }
                 
@@ -176 +193 @@
         }
 }
+
+void check_input() {
+        if (Infile == stdin) {
+                int cnt;
+                ioctl(/* stdin */ 0, FIONREAD, &cnt);
+                if (cnt == 0) {
+                        fprintf(stderr, "> "); /* prompt the user */
+                }
+        }       
+}