mem.isa (7712:7733c562e5e3) mem.isa (8442:b1f3dfae06f1)
1// -*- mode:c++ -*-
2
3// Copyright (c) 2009 The University of Edinburgh
4// All rights reserved.
5//
6// Redistribution and use in source and binary forms, with or without
7// modification, are permitted provided that the following conditions are
8// met: redistributions of source code must retain the above copyright

--- 70 unchanged lines hidden (view full) ---

79 Addr EA;
80 Fault fault = NoFault;
81
82 %(op_decl)s;
83 %(op_rd)s;
84 %(ea_code)s;
85
86 if (fault == NoFault) {
1// -*- mode:c++ -*-
2
3// Copyright (c) 2009 The University of Edinburgh
4// All rights reserved.
5//
6// Redistribution and use in source and binary forms, with or without
7// modification, are permitted provided that the following conditions are
8// met: redistributions of source code must retain the above copyright

--- 70 unchanged lines hidden (view full) ---

79 Addr EA;
80 Fault fault = NoFault;
81
82 %(op_decl)s;
83 %(op_rd)s;
84 %(ea_code)s;
85
86 if (fault == NoFault) {
87 fault = xc->read(EA, (uint%(mem_acc_size)d_t&)Mem, memAccessFlags);
87 fault = readMemAtomic(xc, traceData, EA, Mem, memAccessFlags);
88 %(memacc_code)s;
89 }
90
91 if (fault == NoFault) {
92 %(op_wb)s;
93 }
94
95 return fault;

--- 8 unchanged lines hidden (view full) ---

104 Addr EA;
105 Fault fault = NoFault;
106
107 %(op_src_decl)s;
108 %(op_rd)s;
109 %(ea_code)s;
110
111 if (fault == NoFault) {
88 %(memacc_code)s;
89 }
90
91 if (fault == NoFault) {
92 %(op_wb)s;
93 }
94
95 return fault;

--- 8 unchanged lines hidden (view full) ---

104 Addr EA;
105 Fault fault = NoFault;
106
107 %(op_src_decl)s;
108 %(op_rd)s;
109 %(ea_code)s;
110
111 if (fault == NoFault) {
112 fault = xc->read(EA, (uint%(mem_acc_size)d_t &)Mem, memAccessFlags);
112 fault = readMemTiming(xc, traceData, EA, Mem, memAccessFlags);
113 xc->setEA(EA);
114 }
115
116 return fault;
117 }
118}};
119
120

--- 6 unchanged lines hidden (view full) ---

127 Fault fault = NoFault;
128 uint%(mem_acc_size)d_t val;
129
130 %(op_decl)s;
131 %(op_rd)s;
132
133 EA = xc->getEA();
134
113 xc->setEA(EA);
114 }
115
116 return fault;
117 }
118}};
119
120

--- 6 unchanged lines hidden (view full) ---

127 Fault fault = NoFault;
128 uint%(mem_acc_size)d_t val;
129
130 %(op_decl)s;
131 %(op_rd)s;
132
133 EA = xc->getEA();
134
135 val = pkt->get<uint%(mem_acc_size)d_t>();
135 getMem(pkt, val, traceData);
136 *((uint%(mem_acc_size)d_t*)&Mem) = val;
137
138 if (fault == NoFault) {
139 %(memacc_code)s;
140 }
141
142 if (fault == NoFault) {
143 %(op_wb)s;

--- 15 unchanged lines hidden (view full) ---

159 %(op_rd)s;
160 %(ea_code)s;
161
162 if (fault == NoFault) {
163 %(memacc_code)s;
164 }
165
166 if (fault == NoFault) {
136 *((uint%(mem_acc_size)d_t*)&Mem) = val;
137
138 if (fault == NoFault) {
139 %(memacc_code)s;
140 }
141
142 if (fault == NoFault) {
143 %(op_wb)s;

--- 15 unchanged lines hidden (view full) ---

159 %(op_rd)s;
160 %(ea_code)s;
161
162 if (fault == NoFault) {
163 %(memacc_code)s;
164 }
165
166 if (fault == NoFault) {
167 fault = xc->write((uint%(mem_acc_size)d_t&)Mem, EA,
168 memAccessFlags, NULL);
167 fault = writeMemAtomic(xc, traceData, Mem, EA, memAccessFlags,
168 NULL);
169 }
170
171 if (fault == NoFault) {
172 %(op_wb)s;
173 }
174
175 return fault;
176 }

--- 11 unchanged lines hidden (view full) ---

188 %(op_rd)s;
189 %(ea_code)s;
190
191 if (fault == NoFault) {
192 %(memacc_code)s;
193 }
194
195 if (fault == NoFault) {
169 }
170
171 if (fault == NoFault) {
172 %(op_wb)s;
173 }
174
175 return fault;
176 }

--- 11 unchanged lines hidden (view full) ---

188 %(op_rd)s;
189 %(ea_code)s;
190
191 if (fault == NoFault) {
192 %(memacc_code)s;
193 }
194
195 if (fault == NoFault) {
196 fault = xc->write((uint%(mem_acc_size)d_t&)Mem, EA,
197 memAccessFlags, NULL);
196 fault = writeMemTiming(xc, traceData, Mem, EA, memAccessFlags,
197 NULL);
198 }
199
200 // Need to write back any potential address register update
201 if (fault == NoFault) {
202 %(op_wb)s;
203 }
204
205 return fault;

--- 136 unchanged lines hidden --- 		198 }
199
200 // Need to write back any potential address register update
201 if (fault == NoFault) {
202 %(op_wb)s;
203 }
204
205 return fault;

--- 136 unchanged lines hidden ---