about summary refs log tree commit diff stats
path: root/subx/010---vm.cc
diff options
context:
space:
mode:
authorKartik Agaram <vc@akkartik.com>2018-10-05 14:14:30 -0700
committerKartik Agaram <vc@akkartik.com>2018-10-05 14:14:30 -0700
commit54ed56f2b43c1274ec569aecb9aa97fb4c293546 (patch)
treec0cdd444f806d76c03c96ab2f67fb6b318f3c402 /subx/010---vm.cc
parent15ae0717ba51649dd8042cd5ef0be3bc296b8a26 (diff)
downloadmu-54ed56f2b43c1274ec569aecb9aa97fb4c293546.tar.gz
4665
Some syscalls expect null-terminated strings while others get lengths.
Be clear about this distinction.
Diffstat (limited to 'subx/010---vm.cc')
-rw-r--r--subx/010---vm.cc9
1 files changed, 8 insertions, 1 deletions
diff --git a/subx/010---vm.cc b/subx/010---vm.cc
index 3cad468f..b543216f 100644
--- a/subx/010---vm.cc
+++ b/subx/010---vm.cc
@@ -218,9 +218,16 @@ inline int32_t* mem_addr_i32(uint32_t addr) {
   return reinterpret_cast<int32_t*>(mem_addr_u32(addr));
 }
 // helper for some syscalls. But read-only.
-inline const char* mem_addr_string(uint32_t addr) {
+inline const char* mem_addr_kernel_string(uint32_t addr) {
   return reinterpret_cast<const char*>(mem_addr_u8(addr));
 }
+inline string mem_addr_string(uint32_t addr, uint32_t size) {
+  ostringstream out;
+  for (int i = 0;  i < size;  ++i)
+    out << read_mem_u8(addr+i);
+  return out.str();
+}
+
 
 inline void write_mem_u8(uint32_t addr, uint8_t val) {
   uint8_t* handle = mem_addr_u8(addr);