summaryrefslogtreecommitdiff
path: root/src/arch/alpha/isa
diff options
context:
space:
mode:
authorGabe Black <gblack@eecs.umich.edu>2009-04-19 04:25:01 -0700
committerGabe Black <gblack@eecs.umich.edu>2009-04-19 04:25:01 -0700
commit3e5f4876630169e92b3ad736d747bcba1b79c062 (patch)
treecc6f7aa2f13331839567c1b5844ea2d8412df163 /src/arch/alpha/isa
parentca8598147835cc3bf4cb6125b4f32cbd941f1ae7 (diff)
downloadgem5-3e5f4876630169e92b3ad736d747bcba1b79c062.tar.xz
Memory: Rename LOCKED for load locked store conditional to LLSC.
Diffstat (limited to 'src/arch/alpha/isa')
-rw-r--r--src/arch/alpha/isa/decoder.isa8
-rw-r--r--src/arch/alpha/isa/pal.isa2
2 files changed, 5 insertions, 5 deletions
diff --git a/src/arch/alpha/isa/decoder.isa b/src/arch/alpha/isa/decoder.isa
index 0b2a31410..278ce31e8 100644
--- a/src/arch/alpha/isa/decoder.isa
+++ b/src/arch/alpha/isa/decoder.isa
@@ -45,8 +45,8 @@ decode OPCODE default Unknown::unknown() {
0x0c: ldwu({{ Ra.uq = Mem.uw; }});
0x0b: ldq_u({{ Ra = Mem.uq; }}, ea_code = {{ EA = (Rb + disp) & ~7; }});
0x23: ldt({{ Fa = Mem.df; }});
- 0x2a: ldl_l({{ Ra.sl = Mem.sl; }}, mem_flags = LOCKED);
- 0x2b: ldq_l({{ Ra.uq = Mem.uq; }}, mem_flags = LOCKED);
+ 0x2a: ldl_l({{ Ra.sl = Mem.sl; }}, mem_flags = LLSC);
+ 0x2b: ldq_l({{ Ra.uq = Mem.uq; }}, mem_flags = LLSC);
#ifdef USE_COPY
0x20: MiscPrefetch::copy_load({{ EA = Ra; }},
{{ fault = xc->copySrcTranslate(EA); }},
@@ -87,7 +87,7 @@ decode OPCODE default Unknown::unknown() {
if (tmp == 1) {
xc->setStCondFailures(0);
}
- }}, mem_flags = LOCKED, inst_flags = IsStoreConditional);
+ }}, mem_flags = LLSC, inst_flags = IsStoreConditional);
0x2f: stq_c({{ Mem.uq = Ra; }},
{{
uint64_t tmp = write_result;
@@ -105,7 +105,7 @@ decode OPCODE default Unknown::unknown() {
// only.
xc->setStCondFailures(0);
}
- }}, mem_flags = LOCKED, inst_flags = IsStoreConditional);
+ }}, mem_flags = LLSC, inst_flags = IsStoreConditional);
}
format IntegerOperate {
diff --git a/src/arch/alpha/isa/pal.isa b/src/arch/alpha/isa/pal.isa
index 3d3b81600..0931c1aec 100644
--- a/src/arch/alpha/isa/pal.isa
+++ b/src/arch/alpha/isa/pal.isa
@@ -178,7 +178,7 @@ output decoder {{
if (HW_LDST_PHYS) memAccessFlags.set(Request::PHYSICAL);
if (HW_LDST_ALT) memAccessFlags.set(Request::ALTMODE);
if (HW_LDST_VPTE) memAccessFlags.set(Request::VPTE);
- if (HW_LDST_LOCK) memAccessFlags.set(Request::LOCKED);
+ if (HW_LDST_LOCK) memAccessFlags.set(Request::LLSC);
}
std::string