Changed the hierarchy of format objects.

4 files changed, 7 insertions, 4 deletions

diff --git a/src/analysis/disass/area.c b/src/analysis/disass/area.c
index eaec25d..351bb9e 100644
--- a/src/analysis/disass/area.c
+++ b/src/analysis/disass/area.c
@@ -40,6 +40,7 @@
 #include "../../core/global.h"
 #include "../../core/logs.h"
 #include "../../core/nproc.h"
+#include "../../format/known.h"
 #include "../../format/format.h"
 #include "../../glibext/delayed-int.h"
 
@@ -282,7 +283,7 @@ static void init_mem_area_from_addr(mem_area *area, const vmpa2t *addr, phys_t l
 
     init_mrange(&area->range, addr, len);
 
-    content = g_binary_format_get_content(area->format);
+    content = g_known_format_get_content(G_KNOWN_FORMAT(area->format));
 
     area->content = g_restricted_content_new(content, &area->range);
 
diff --git a/src/analysis/disass/disassembler.c b/src/analysis/disass/disassembler.c
index d35628b..607f1e4 100644
--- a/src/analysis/disass/disassembler.c
+++ b/src/analysis/disass/disassembler.c
@@ -398,7 +398,7 @@ void output_disassembly(GLoadedBinary *binary, GProcContext *context, GtkStatusS
      */
 
     format = G_BIN_FORMAT(g_loaded_binary_get_format(binary));
-    content = g_binary_format_get_content(format);
+    content = g_known_format_get_content(G_KNOWN_FORMAT(format));
     lang = g_asm_language_new();
 
     *cache = g_buffer_cache_new(content);
diff --git a/src/analysis/disass/fetch.c b/src/analysis/disass/fetch.c
index dc06511..f3fd462 100644
--- a/src/analysis/disass/fetch.c
+++ b/src/analysis/disass/fetch.c
@@ -32,6 +32,7 @@
 
 #include "area.h"
 #include "../../core/global.h"
+#include "../../format/known.h"
 #include "../../format/format.h"
 #include "../../glibext/delayed-int.h"
 
@@ -411,7 +412,7 @@ GArchInstruction **disassemble_binary_content(GLoadedBinary *binary, GProcContex
 
     template.ctx = ctx;
 
-    content = g_binary_format_get_content(format);
+    content = g_known_format_get_content(G_KNOWN_FORMAT(format));
     length = g_binary_content_compute_size(content);
     g_object_unref(G_OBJECT(content));
 
diff --git a/src/analysis/disass/output.c b/src/analysis/disass/output.c
index ff2b526..f2e423c 100644
--- a/src/analysis/disass/output.c
+++ b/src/analysis/disass/output.c
@@ -31,6 +31,7 @@
 
 
 #include "../../core/logs.h"
+#include "../../format/known.h"
 #include "../../format/format.h"
 #include "../../format/symiter.h"
 #include "../../glibext/generators/rborder.h"
@@ -125,7 +126,7 @@ void print_disassembled_instructions(GBufferCache *cache, GCodingLanguage *lang,
 
     msize = g_arch_processor_get_memory_size(proc);
 
-    content = g_binary_format_get_content(G_BIN_FORMAT(format));
+    content = g_known_format_get_content(G_KNOWN_FORMAT(format));
 
     g_arch_processor_lock(proc);