[mc] Inline mc_snapshot_read_region()

[simgrid.git] / src / mc / mc_snapshot.c

diff --git a/src/mc/mc_snapshot.c b/src/mc/mc_snapshot.c
index 7f36291..a7bd4df 100644 (file)
--- a/src/mc/mc_snapshot.c
+++ b/src/mc/mc_snapshot.c
@@ -25,61 +25,6 @@ mc_mem_region_t mc_get_snapshot_region(void* addr, mc_snapshot_t snapshot)
   return NULL;
 }
 
-static inline __attribute__((always_inline))
-void* mc_translate_address_region(uintptr_t addr, mc_mem_region_t region)
-{
-    size_t pageno = mc_page_number(region->start_addr, (void*) addr);
-    size_t snapshot_pageno = region->page_numbers[pageno];
-    const void* snapshot_page = mc_page_store_get_page(mc_model_checker->pages, snapshot_pageno);
-    return (char*) snapshot_page + mc_page_offset((void*) addr);
-}
-
-/** \brief Translate a pointer from process address space to snapshot address space
- *
- *  The address space contains snapshot of the main/application memory:
- *  this function finds the address in a given snaphot for a given
- *  real/application address.
- *
- *  For read only memory regions and other regions which are not int the
- *  snapshot, the address is not changed.
- *
- *  \param addr     Application address
- *  \param snapshot The snapshot of interest (if NULL no translation is done)
- *  \return         Translated address in the snapshot address space
- * */
-static inline __attribute__((always_inline))
-void* mc_translate_address(uintptr_t addr, mc_snapshot_t snapshot)
-{
-
-  // If not in a process state/clone:
-  if (!snapshot) {
-    return (uintptr_t *) addr;
-  }
-
-  mc_mem_region_t region = mc_get_snapshot_region((void*) addr, snapshot);
-
-  xbt_assert(mc_region_contain(region, (void*) addr), "Trying to read out of the region boundary.");
-
-  if (!region) {
-    return (void *) addr;
-  }
-
-  // Flat snapshot:
-  else if (region->data) {
-    uintptr_t offset = addr - (uintptr_t) region->start_addr;
-    return (void *) ((uintptr_t) region->data + offset);
-  }
-
-  // Per-page snapshot:
-  else if (region->page_numbers) {
-    return mc_translate_address_region(addr, region);
-  }
-
-  else {
-    xbt_die("No data for this memory region");
-  }
-}
-
 /** @brief Read memory from a snapshot region broken across fragmented pages
  *
  *  @param addr    Process (non-snapshot) address of the data
@@ -88,7 +33,7 @@ void* mc_translate_address(uintptr_t addr, mc_snapshot_t snapshot)
  *  @param size    Size of the data to read in bytes
  *  @return Pointer where the data is located (target buffer of original location)
  */
-static void* mc_snapshot_read_fragmented(void* addr, mc_mem_region_t region, void* target, size_t size)
+void* mc_snapshot_read_fragmented(void* addr, mc_mem_region_t region, void* target, size_t size)
 {
   void* end = (char*) addr + size - 1;
   size_t page_end = mc_page_number(NULL, end);
@@ -112,43 +57,6 @@ static void* mc_snapshot_read_fragmented(void* addr, mc_mem_region_t region, voi
   return target;
 }
 
-/** @brief Read memory from a snapshot region
- *
- *  @param addr    Process (non-snapshot) address of the data
- *  @param region  Snapshot memory region where the data is located
- *  @param target  Buffer to store the value
- *  @param size    Size of the data to read in bytes
- *  @return Pointer where the data is located (target buffer of original location)
- */
-void* mc_snapshot_read_region(void* addr, mc_mem_region_t region, void* target, size_t size)
-{
-  uintptr_t offset = (uintptr_t) addr - (uintptr_t) region->start_addr;
-
-  xbt_assert(addr >= region->start_addr && (char*) addr+size < (char*)region->start_addr+region->size,
-    "Trying to read out of the region boundary.");
-
-  // Linear memory region:
-  if (region->data) {
-    return (void*) ((uintptr_t) region->data + offset);
-  }
-
-  // Fragmented memory region:
-  else if (region->page_numbers) {
-    void* end = (char*) addr + size - 1;
-    if( mc_same_page(addr, end) ) {
-      // The memory is contained in a single page:
-      return mc_translate_address_region((uintptr_t) addr, region);
-    } else {
-      // The memory spans several pages:
-      return mc_snapshot_read_fragmented(addr, region, target, size);
-    }
-  }
-
-  else {
-    xbt_die("No data available for this region");
-  }
-}
-
 /** @brief Read memory from a snapshot
  *
  *  @param addr     Process (non-snapshot) address of the data