Struct cleanup

git-svn-id: svn://svn.cc65.org/cc65/trunk@1259 b7a2c559-68d2-44c3-8de9-860c34a00d81

diff --git a/asminc/modload.inc b/asminc/modload.inc
index a8be525aa1519df1f7fb3601d1bf53501f50c186..466f8e57ed9ad6080badd39b9d0274f1e18a687c 100644 (file)
--- a/asminc/modload.inc
+++ b/asminc/modload.inc
@@ -47,13 +47,8 @@ MODCTRL_READ            =       0
 MODCTRL_CALLERDATA      =       2
 MODCTRL_MODULE          =       4       ; Pointer to module data
 MODCTRL_MODULE_SIZE     =       6       ; Total size of loaded module
-MODCTRL_CODE            =       8       ; Pointer to code segment
-MODCTRL_CODE_SIZE       =      10       ; Size of code segment
-MODCTRL_DATA            =      12       ; Pointer to data segment
-MODCTRL_DATA_SIZE       =      14       ; Size of data segment
-MODCTRL_BSS             =      16       ; Pointer to bss segment
-MODCTRL_BSS_SIZE        =      18       ; Size of bss segment
-MODCTRL_SIZE            =      20       ; Total size of struct
+MODCTRL_MODULE_ID       =       8
+MODCTRL_SIZE            =      10       ; Total size of struct
 
 
 ; unsigned char mod_load (struct mod_ctrl* ctrl);

diff --git a/include/modload.h b/include/modload.h
index b04ae70541048241dce8b0a799b26651251dc791..2b2397dd4a7c9d03fb9e4cdb59b645a2c9123193 100644 (file)
--- a/include/modload.h
+++ b/include/modload.h
@@ -63,12 +63,7 @@ struct mod_ctrl {
     /* Parameters set by the loader routine */
     void*           module;             /* Pointer to module data */
     unsigned        module_size;        /* Total size of loaded module */
-    void*           code;               /* Pointer to code segment */
-    unsigned        code_size;          /* Size of code segment */
-    void*           data;               /* Pointer to data segment */
-    unsigned        data_size;          /* Size of data segment */
-    void*           bss;                /* Pointer to bss segment */
-    unsigned        bss_size;           /* Size of bss segment */
+    unsigned        module_id;          /* Module id */
 };