3c3
< // Copyright (c) 2010 ARM Limited
---
> // Copyright (c) 2010-2012 ARM Limited
51,52c51,52
< base = 'Memory', wbDecl = None, pcDecl = None,
< rasPop = False):
---
> base='Memory', wbDecl=None, pcDecl=None,
> rasPop=False, size=4, sign=False, faCode=None):
65a66,81
> if faCode:
> # For AArch64 the fa_code snippet comes already assembled here
> codeBlobs["fa_code"] = faCode
> elif wbDecl == None:
> codeBlobs["fa_code"] = '''
> if (dest != INTREG_PC) {
> fault->annotate(ArmFault::SAS, %s);
> fault->annotate(ArmFault::SSE, %s);
> fault->annotate(ArmFault::SRT, dest);
> }
> ''' %("0" if size == 1 else
> "1" if size == 2 else "2",
> "true" if sign else "false")
> else:
> codeBlobs["fa_code"] = ''
>
110a127
> "fa_code" : '',
179,180c196,202
< if size == 4:
< memSuffix = ''
---
> if size == 8:
> memSuffix = '_ud'
> elif size == 4:
> if sign:
> memSuffix = '_sw'
> else:
> memSuffix = '_uw'