Changeset 2190

Timestamp:

May 30, 2012, 10:13:03 AM (7 years ago)

Author:

ksherdy

Message:

Fixed src_buffer copyback.

Location:

proto/parabix2

Files:

• pablo_template_symbol_table.cpp (modified) (3 diffs)
• src/Makefile (modified) (1 diff)

proto/parabix2/pablo_template_symbol_table.cpp

@@ -23 +23 @@
 #include <XMLTestSuiteError.h>
 
-// #define SYMBOL_TABLE
-// #define DUMP_SYMBOLS
+#define SYMBOL_TABLE
+#define DUMP_SYMBOLS
 
 #ifdef BUFFER_PROFILING
@@ -52 +52 @@
 #define LOOKAHEAD_BLOCKS 1
 #define LOOKAHEAD_SIZE (BLOCK_SIZE * LOOKAHEAD_BLOCKS)
-#define SEGMENT_BLOCKS  12
+#define SEGMENT_BLOCKS  2
 #define SEGMENT_SIZE (BLOCK_SIZE * SEGMENT_BLOCKS)
 #define BUFFER_SIZE (COPYBACK_SIZE + SEGMENT_SIZE + LOOKAHEAD_SIZE + PADDING_SIZE)
@@ -319 +319 @@
           PERF_SEC_END(parser_timer, chars_avail);
 
-          memmove(src_buffer, &src_buffer[SEGMENT_SIZE], LOOKAHEAD_SIZE); // CopyBack Trailing Padding
+          memmove(src_buffer, &src_buffer[SEGMENT_SIZE], LOOKAHEAD_SIZE); 
           #ifdef SYMBOL_TABLE
-                  //COPY_BACK_BYTE_BUFFER(COPYBACK, src_buffer);
+                  COPY_BACK_BYTE_BUFFER(COPYBACK, src_buffer);
                         COPY_BACK_BITBLOCK_BUFFER(COPYBACK_h0,h0);
                         COPY_BACK_BITBLOCK_BUFFER(COPYBACK_h1,h1);

proto/parabix2/src/Makefile

@@ -54 +54 @@
 
 id: $(SRCFILE)
-        $(CC) -o id $(SRCFILE) -I$(INCLUDES) $(AFLAGS) -DID_STRATEGY -DBUFFER_PROFILING -DPERF_SCRIPT 
+        $(CC) -o id $(SRCFILE) -I$(INCLUDES) $(AFLAGS) -DID_STRATEGY # -DBUFFER_PROFILING -DPERF_SCRIPT 
 
 div2: $(SRCFILE)