Nathan Binkert wrote:
> # HG changeset patch
> # User Nathan Binkert <[email protected]>
> # Date 1257554904 28800
> # Node ID 4295150ba57fcd97ec518ec085fb62ffc89783be
> # Parent  fb4a3a61bc745c49975c552927ae9a35405f02dd
> compile: wrap 64bit numbers with ULL() so 32bit compiles work
> In the isa_parser, we need to check case statements.
>
> diff --git a/src/arch/isa_parser.py b/src/arch/isa_parser.py
> --- a/src/arch/isa_parser.py
> +++ b/src/arch/isa_parser.py
> @@ -585,7 +585,12 @@
>      # 'default'
>      def p_case_label_0(self, t):
>          'case_label : intlit_list'
> -        t[0] = ': '.join(map(lambda a: 'case %#x' % a, t[1]))
> +        def make_case(intlit):
> +            if intlit >= 2**32:
> +                return 'case ULL(%#x)' % intlit
> +            else:
> +                return 'case %#x' % intlit
> +        t[0] = ': '.join(map(make_case, t[1]))
>  
>      def p_case_label_1(self, t):
>          'case_label : DEFAULT'
> diff --git a/src/arch/x86/process.cc b/src/arch/x86/process.cc
> --- a/src/arch/x86/process.cc
> +++ b/src/arch/x86/process.cc
> @@ -175,7 +175,7 @@
>          int _numSyscallDescs) :
>      X86LiveProcess(params, objFile, _syscallDescs, _numSyscallDescs)
>  {
> -    _gdtStart = 0x100000000;
> +    _gdtStart = ULL(0x100000000);
>      _gdtSize = VMPageSize;
>  
>      vsyscallPage.base = 0xffffe000ULL;
> _______________________________________________
> m5-dev mailing list
> [email protected]
> http://m5sim.org/mailman/listinfo/m5-dev
>   

That looks good to me. If it works I'd say commit it.

Gabe
_______________________________________________
m5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/m5-dev

Reply via email to