diff -r 4d1005f78496 -r 1810956fa5dc src/arch/isa_parser.py
--- a/src/arch/isa_parser.py	Tue Jun 07 00:24:49 2011 -0700
+++ b/src/arch/isa_parser.py	Tue Jun 07 00:46:54 2011 -0700
@@ -1215,7 +1215,7 @@
         return t
 
     def t_NEWFILE(self, t):
-        r'^\#\#newfile\s+"[\w/.-]*"'
+        r'^\#\#newfile\s+"[^"]*"'
         self.fileNameStack.push((t.value[11:-1], t.lexer.lineno))
         t.lexer.lineno = 0
 
@@ -1998,7 +1998,7 @@
             f.close()
 
     # This regular expression matches '##include' directives
-    includeRE = re.compile(r'^\s*##include\s+"(?P<filename>[\w/.-]*)".*$',
+    includeRE = re.compile(r'^\s*##include\s+"(?P<filename>[^"]*)".*$',
                            re.MULTILINE)
 
     def replace_include(self, matchobj, dirname):