Yes, i have already modified FSconfig.py. So, How I can update both modified and not modified files by hg update?
On 4/17/12, Hossein Nikoonia <[email protected]> wrote: > Did you > > hg pull > hg update > ? > > You might have modified FSConfig.py (which probably you did this) and > hg might not be able to merge your changes with the recent version of > FSConfig .. > > On Tue, Apr 17, 2012 at 12:08 PM, Hamid Reza Khaleghzadeh > <[email protected]> wrote: >> Hello dear Mahmood, >> >> It worked. But I have a question. I go to gem5 repository and find >> that this correction (convering PhysicalMemory to SimpleMemory) has >> been done. Could you tell me why "hg update" doesn't modify >> FSconfig.py to the latest version? >> >> Thanks >> >> On 4/17/12, Mahmood Naderan <[email protected]> wrote: >>> PhysicalMemory -> SimpleMemory >>> >>> On 4/16/12, Hamid Reza Khaleghzadeh <[email protected]> wrote: >>>> Hi, >>>> >>>> I cannot execute new revision of Gem5 by fs.py script. The problem is: >>>> >>>> Traceback (most recent call last): >>>> File "<string>", line 1, in <module> >>>> File "/home/hamidreza/gem5/src/python/m5/main.py", line 357, in main >>>> exec filecode in scope >>>> File "/home/hamidreza/gem5/configs/example/fs.py", line 96, in >>>> <module> >>>> test_sys = makeLinuxAlphaSystem(test_mem_mode, bm[0]) >>>> File "/home/hamidreza/gem5/configs/common/FSConfig.py", line 76, in >>>> makeLinuxAlphaSystem >>>> self.physmem = PhysicalMemory(range = AddrRange(mdesc.mem())) >>>> NameError: global name 'PhysicalMemory' is not defined >>>> >>>> Could you tell me how i can solve the problem? >>>> >>>> Thanks >>>> _______________________________________________ >>>> gem5-users mailing list >>>> [email protected] >>>> http://m5sim.org/cgi-bin/mailman/listinfo/gem5-users >>>> >>> >>> >>> -- >>> -- >>> // Naderan *Mahmood; >>> _______________________________________________ >>> gem5-users mailing list >>> [email protected] >>> http://m5sim.org/cgi-bin/mailman/listinfo/gem5-users >>> >> >> >> -- >> Hamid Reza Khaleghzadeh >> hkhaleghzadeh.webs.com >> _______________________________________________ >> gem5-users mailing list >> [email protected] >> http://m5sim.org/cgi-bin/mailman/listinfo/gem5-users > _______________________________________________ > gem5-users mailing list > [email protected] > http://m5sim.org/cgi-bin/mailman/listinfo/gem5-users > -- Hamid Reza Khaleghzadeh hkhaleghzadeh.webs.com _______________________________________________ gem5-users mailing list [email protected] http://m5sim.org/cgi-bin/mailman/listinfo/gem5-users
