Hi Derek, Do you need any more help merging your outstanding changes? I'm almost ready to check in my changes that unify configuration and the eventqueue. However, I want to give you the opportunity to check in your changes first.
Let me know if there is anything I can do to help. Thanks, Brad -----Original Message----- From: [email protected] [mailto:[email protected]] On Behalf Of Derek Hower Sent: Tuesday, December 08, 2009 11:42 AM To: M5 Developer List Subject: [m5-dev] Merging I've been working on merging the outstanding changes at Wisconsin over the past few days. It's been tricky, but hopefully I've completed the merge without doing damage. I can't use the new python SLICC here, though. I think it's a python version problem, but I was hoping someone could provide a little more insight. Here's the error I get on a fresh checkout of M5 (no merge): scons build/ALPHA_SE/tests/fast/quick/50.memtest/alpha/linux/memtest-ruby RUBY=True File "/afs/cs.wisc.edu/p/multifacet/users/drh5/gem5_latest/src/mem/slicc/symb ols/Type.py", line 433 init = ' = %s_FIRST' % self.c_ident if i == 0 else '' ^ SyntaxError: invalid syntax Any ideas? -Derek _______________________________________________ m5-dev mailing list [email protected] http://m5sim.org/mailman/listinfo/m5-dev _______________________________________________ m5-dev mailing list [email protected] http://m5sim.org/mailman/listinfo/m5-dev
