summaryrefslogtreecommitdiff
path: root/utils/hwstub/tools/hwstub_shell.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'utils/hwstub/tools/hwstub_shell.cpp')
-rw-r--r--utils/hwstub/tools/hwstub_shell.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/utils/hwstub/tools/hwstub_shell.cpp b/utils/hwstub/tools/hwstub_shell.cpp
index b2838ebed0..30d1ac3b3f 100644
--- a/utils/hwstub/tools/hwstub_shell.cpp
+++ b/utils/hwstub/tools/hwstub_shell.cpp
@@ -144,7 +144,7 @@ typedef void (*hw_writen_fn_t)(lua_State *state, soc_addr_t addr, soc_word_t val
144soc_word_t hw_read8(lua_State *state, soc_addr_t addr) 144soc_word_t hw_read8(lua_State *state, soc_addr_t addr)
145{ 145{
146 uint8_t u; 146 uint8_t u;
147 if(hwstub_rw_mem(g_hwdev, 1, addr, &u, sizeof(u)) != sizeof(u)) 147 if(hwstub_rw_mem_atomic(g_hwdev, 1, addr, &u, sizeof(u)) != sizeof(u))
148 luaL_error(state, "fail to read8 @ %p", addr); 148 luaL_error(state, "fail to read8 @ %p", addr);
149 return u; 149 return u;
150} 150}
@@ -152,7 +152,7 @@ soc_word_t hw_read8(lua_State *state, soc_addr_t addr)
152soc_word_t hw_read16(lua_State *state, soc_addr_t addr) 152soc_word_t hw_read16(lua_State *state, soc_addr_t addr)
153{ 153{
154 uint16_t u; 154 uint16_t u;
155 if(hwstub_rw_mem(g_hwdev, 1, addr, &u, sizeof(u)) != sizeof(u)) 155 if(hwstub_rw_mem_atomic(g_hwdev, 1, addr, &u, sizeof(u)) != sizeof(u))
156 luaL_error(state, "fail to read16 @ %p", addr); 156 luaL_error(state, "fail to read16 @ %p", addr);
157 return u; 157 return u;
158} 158}
@@ -160,7 +160,7 @@ soc_word_t hw_read16(lua_State *state, soc_addr_t addr)
160soc_word_t hw_read32(lua_State *state, soc_addr_t addr) 160soc_word_t hw_read32(lua_State *state, soc_addr_t addr)
161{ 161{
162 uint32_t u; 162 uint32_t u;
163 if(hwstub_rw_mem(g_hwdev, 1, addr, &u, sizeof(u)) != sizeof(u)) 163 if(hwstub_rw_mem_atomic(g_hwdev, 1, addr, &u, sizeof(u)) != sizeof(u))
164 luaL_error(state, "fail to read32 @ %p", addr); 164 luaL_error(state, "fail to read32 @ %p", addr);
165 return u; 165 return u;
166} 166}
@@ -168,21 +168,21 @@ soc_word_t hw_read32(lua_State *state, soc_addr_t addr)
168void hw_write8(lua_State *state, soc_addr_t addr, soc_word_t val) 168void hw_write8(lua_State *state, soc_addr_t addr, soc_word_t val)
169{ 169{
170 uint8_t u = val; 170 uint8_t u = val;
171 if(hwstub_rw_mem(g_hwdev, 0, addr, &u, sizeof(u)) != sizeof(u)) 171 if(hwstub_rw_mem_atomic(g_hwdev, 0, addr, &u, sizeof(u)) != sizeof(u))
172 luaL_error(state, "fail to write8 @ %p", addr); 172 luaL_error(state, "fail to write8 @ %p", addr);
173} 173}
174 174
175void hw_write16(lua_State *state, soc_addr_t addr, soc_word_t val) 175void hw_write16(lua_State *state, soc_addr_t addr, soc_word_t val)
176{ 176{
177 uint16_t u = val; 177 uint16_t u = val;
178 if(hwstub_rw_mem(g_hwdev, 0, addr, &u, sizeof(u)) != sizeof(u)) 178 if(hwstub_rw_mem_atomic(g_hwdev, 0, addr, &u, sizeof(u)) != sizeof(u))
179 luaL_error(state, "fail to write16 @ %p", addr); 179 luaL_error(state, "fail to write16 @ %p", addr);
180} 180}
181 181
182void hw_write32(lua_State *state, soc_addr_t addr, soc_word_t val) 182void hw_write32(lua_State *state, soc_addr_t addr, soc_word_t val)
183{ 183{
184 uint32_t u = val; 184 uint32_t u = val;
185 if(hwstub_rw_mem(g_hwdev, 0, addr, &u, sizeof(u)) != sizeof(u)) 185 if(hwstub_rw_mem_atomic(g_hwdev, 0, addr, &u, sizeof(u)) != sizeof(u))
186 luaL_error(state, "fail to write32 @ %p", addr); 186 luaL_error(state, "fail to write32 @ %p", addr);
187} 187}
188 188