Decoding rework WIP

Author: BlockoS

CMakeLists.txt

@@ -1,8 +1,17 @@
-cmake_minimum_required (VERSION 3.30)
+cmake_minimum_required(VERSION 4.3.0)
 
 project(etripator
-    VERSION 0.9.0
-    LANGUAGES C)
+    VERSION 1.0.0
+    LANGUAGES C
+)
+
+if(NOT CMAKE_BUILD_TYPE)
+    message(STATUS, "No build type specified. Force build type to Debug.")
+    set(CMAKE_BUILD_TYPE "Debug")
+endif()
+
+set(CMAKE_C_STANDARDS 11)
+add_compile_options(-Wall -Wextra -Wshadow)
 
 if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
     add_compile_definitions(_DARWIN_C_SOURCE=__DARWIN_C_FULL)
@@ -15,67 +24,15 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 enable_testing()
 
 include(CheckSymbolExists)
-
 check_symbol_exists(strdup "string.h" HAVE_STRDUP)
 
-if(NOT CMAKE_BUILD_TYPE)
-    message(STATUS, "No build type specified. Force build type to Debug.")
-    set(CMAKE_BUILD_TYPE "Debug")
-endif()
-
-find_package(Doxygen)
 find_package(Jansson)
 
-set(CMAKE_C_STANDARDS 11)
-
 add_subdirectory(externals EXCLUDE_FROM_ALL)
 
-set(etripator_SRC
-    message.c 
-    message/file.c
-    message/console.c
-    jsonhelpers.c
-    decode.c
-    section.c
-    section/load.c
-    section/save.c
-    opcodes.c
-    comment.c
-    comment/load.c
-    comment/save.c
-    label.c
-    label/load.c
-    label/save.c
-    irq.c
-    memory.c
-    memory_map.c
-    rom.c
-    cd.c
-    ipl.c
-    output.c
-#    wla_dx.c
-)
+add_subdirectory(src)
 
-set(etripator_HDR
-    config.h
-    message.h
-    message/file.h
-    message/console.h
-    jsonhelpers.h
-    decode.h
-    section.h
-    opcodes.h
-    comment.h
-    label.h
-    irq.h
-    memory.h
-    memory_map.h
-    rom.h
-    cd.h
-    ipl.h
-    output.h
-#    wla_dx.h
-)
+#[[
 
 add_library(etripator STATIC ${etripator_SRC} ${etripator_HDR})
 set_target_properties(etripator PROPERTIES C_STANDARD 11)
@@ -93,6 +50,12 @@ target_include_directories(etripator_cli PRIVATE ${CMAKE_SOURCE_DIR})
 target_include_directories(etripator_cli PUBLIC externals)
 target_link_libraries(etripator_cli etripator cargs)
 
+#]]
+
+add_subdirectory(test)
+
+find_package(Doxygen)
+
 set(DOXYFILE_IN ${CMAKE_CURRENT_SOURCE_DIR}/doxyfile.in)
 set(DOXYFILE ${CMAKE_CURRENT_BINARY_DIR}/doxyfile)
 
@@ -106,6 +69,3 @@ add_custom_target(doc
     VERBATIM
 )
 
-add_subdirectory(test)
-
-install(TARGETS etripator_cli DESTINATION bin)

externals/CMakeLists.txt

@@ -4,5 +4,6 @@ add_subdirectory(cwalk)
 add_library(munit STATIC ${CMAKE_CURRENT_LIST_DIR}/munit/munit.c)
 target_include_directories(munit PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/munit>)
 set_property(TARGET munit PROPERTY INTERFACE_INCLUDE_DIRECTORIES $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/munit>)
+target_compile_definitions(munit PRIVATE MUNIT_NO_FORK)
 
 add_subdirectory(fff)

cd.h include/etripator/cd.hcd.h renamed to include/etripator/cd.h

@@ -37,30 +37,33 @@
 #define ETRIPATOR_CD_H
 
 #include "config.h"
+#include "data.h"
 #include "memory_map.h"
 
-#define PCE_CD_RAM_BANK_COUNT 8U
-#define PCE_SYSCARD_RAM_BANK_COUNT 24U
+#define PCE_CD_RAM_BANK_COUNT (8U)
+#define PCE_SYSCARD_RAM_BANK_COUNT (24U)
 
-#define PCE_CD_RAM_FIRST_PAGE 0x80U
-#define PCE_SYSCARD_RAM_FIRST_PAGE 0x68U
+#define PCE_CD_RAM_FIRST_PAGE (0x80U)
+#define PCE_SYSCARD_RAM_FIRST_PAGE (0x68U)
 
 /// Adds CD RAM to memory map.
 /// \param map Memory map.
 /// \return true if the CD RAM and SYSCARD RAM memory areas were successfully created.
 /// \return false if an error occured.
 bool cd_memory_map(MemoryMap *map);
 
+// [todo] arcade card
+
 /// Load CDROM data from file.
-/// \param [in]  filename    CDROM data filename.
+/// \param [out] map         Memory map.
+/// \param [in]  input       Input data.
 /// \param [in]  start       CDROM data offset.
 /// \param [in]  len         CDROM data length (in bytes).
 /// \param [in]  sector_size CD sector size.
 /// \param [in]  page        Memory page.
 /// \param [in]  offset      Memory page offset.
-/// \param [out] map         Memory map.
 /// \return true
 /// \return false
-bool cd_load(const char* filename, size_t start, size_t len, size_t sector_size, uint8_t page, size_t offset, MemoryMap* map);
+bool cd_load(MemoryMap* map, Data* input, size_t start, size_t len, size_t sector_size, uint8_t page, size_t offset);
 
 #endif // ETRIPATOR_CD_H

comment.h include/etripator/comment.hcomment.h renamed to include/etripator/comment.h

@@ -37,12 +37,16 @@
 #define ETRIPATOR_COMMENT_H
 
 #include "config.h"
+#include "string.h"
+
+/// @defgroup Comments Comments management
+/// @{
 
 /// Comment.
 typedef struct {
-    uint16_t logical; //< Logical address.
-    uint8_t  page;    //< Memory page.
-    char*    text;    //< Comment text.
+    uint16_t     logical; //< Logical address.
+    uint8_t      page;    //< Memory page.
+    String text;    //< Comment text.
 } Comment;
 
 /// Comment repository.
@@ -69,7 +73,7 @@ void comment_repository_destroy(CommentRepository* repository);
 /// \param [in]     text        Comment text.
 /// \return true if the comment was successfully added to the repository.
 /// \return false if an error occured.
-bool comment_repository_add(CommentRepository* repository, uint16_t logical, uint8_t page, const char *text);
+bool comment_repository_add(CommentRepository* repository, uint16_t logical, uint8_t page, String *text);
 
 /// Find a comment by its address.
 /// \param [in]  repository  Comment repository.
@@ -114,4 +118,6 @@ bool comment_repository_load(CommentRepository* repository, const char* filename
 /// \return false if an error occured.
 bool comment_repository_save(CommentRepository* repository, const char* filename);
 
+/// @}
+
 #endif // ETRIPATOR_COMMENT_H

config.h include/etripator/config.hconfig.h renamed to include/etripator/config.h

@@ -36,6 +36,7 @@
 #ifndef ETRIPATOR_CONFIG_H
 #define ETRIPATOR_CONFIG_H
 
+#include <stddef.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <stdarg.h>

opcodes.h include/etripator/data.hopcodes.h renamed to include/etripator/data.h

@@ -33,91 +33,48 @@
 ¬°¤*,¸¸,*¤°¬¯¬°¤*,¸_¸,*¤°¬°¤*,¸,*¤°¬¯¬°¤*,¸_¸,*¤°¬°¤*,¸,*¤°¬¯¬°¤*,¸_¸,*¤°¬°¤*,¸
 ¸,*¤°¬¯¬°¤*,¸_¸,*¤°¬°¤*,¸,*¤°¬¯¬°¤*,¸_¸,*¤°¬°¤*,¸,*¤°¬¯¬°¤*,¸_¸,*¤°¬°¤*,¸,*¤°¬¯
 */
-#ifndef ETRIPATOR_OPCODES_H
-#define ETRIPATOR_OPCODES_H
+#ifndef ETRIPATOR_DATA_H
+#define ETRIPATOR_DATA_H
 
 #include "config.h"
 
-/// @defgroup Opcode Opcode
-///@{
+/// @defgroup DataGroup Data access
+/// @{
 
-/// Opcode types:
-/// -# `OPC`
-/// -# `OPC A`
-/// -# `OPC #nn`
-/// -# `OPC #nn, ZZ`
-/// -# `OPC #nn, ZZ, X`
-/// -# `OPC #nn, hhll`
-/// -# `OPC #nn, hhll, X`
-/// -# `OPC ZZ`
-/// -# `OPC ZZ, X`
-/// -# `OPC ZZ, Y`
-/// -# `OPC (ZZ)`
-/// -# `OPC (ZZ, X)`
-/// -# `OPC (ZZ), Y`
-/// -# `OPC ZZ, hhll`
-/// -# `OPC hhll`
-/// -# `OPC (hhll)`
-/// -# `OPC hhll, X`
-/// -# `OPC hhll, Y`
-/// -# `OPC shsl,dhdl,hhll` 
-/// -# `OPC l_hhll` (label)
-/// -# `OPC ZZ, l_hhll` (label)
-/// -# `OPC [hhll, X]` 
-/// -# `.db OPC` (unsupported opcode output as raw binary data)
-enum PCE_ADDRESSING_MODE {    
-    PCE_OP = 0,
-    PCE_OP_A,
-    PCE_OP_nn,
-    PCE_OP_nn_ZZ,
-    PCE_OP_nn_ZZ_X,
-    PCE_OP_nn_hhll,
-    PCE_OP_nn_hhll_X,
-    PCE_OP_ZZ,
-    PCE_OP_ZZ_X,
-    PCE_OP_ZZ_Y,
-    PCE_OP__ZZ__,
-    PCE_OP__ZZ_X__,
-    PCE_OP__ZZ__Y_,
-    PCE_OP_ZZ_hhll,   
-    PCE_OP_hhll,
-    PCE_OP__hhll__,
-    PCE_OP_hhll_X,
-    PCE_OP_hhll_Y,
-    PCE_OP_shsl_dhdl_hhll, 
-    PCE_OP__lbl__,
-    PCE_OP_ZZ_lbl,
-    PCE_OP__hhll_X__,
-    PCE_unknown
-};
+struct Data;
+typedef struct Data Data;
 
-#define OPCODE_NAME_MAX_LEN 5U
-
-/// Opcode
-typedef struct {
-  char    name[OPCODE_NAME_MAX_LEN]; //< name
-  uint8_t size; //< size in bytes
-  uint8_t type; //< addressing type
-} Opcode;
-
-/// Get opcode description
-/// \param [in] op Opcode id
-/// \return Pointer to opcode description
-const Opcode* opcode_get(uint8_t op);
-
-/// Get opcode format string
-/// \param [in] op Pointer to opcode description
-/// \param [in] i  Opcode argument id
-/// \return Argument format string
-/// \return NULL if the argument id is out of opcode argument count
-const char* opcode_format(const Opcode *op, int i);
-
-/// Is the instruction a local jump ?
-bool opcode_is_local_jump(uint8_t op);
-
-/// Is the instruction a "far" jump ?
-bool opcode_is_far_jump(uint8_t op);
+/// Create in memory buffer data.
+/// @param [in] buffer Pointer to memory buffer.
+/// @param [in] size Memory buffer size.
+/// @return Pointer to memory buffer data.
+/// @return NULL if buffer is NULL or size is zero.
+Data* data_buffer_create(uint8_t *buffer, size_t size);
+/// Create file data.
+/// @param [in] filename File name.
+/// @param [in] mode [TODO]
+/// @return Pointer to file data.
+/// @return NULL [TODO]
+Data* data_file_create(const char *filename, const char* mode);
+///
+void data_release(Data *data);
+///
+bool data_open(Data *data);
+///
+void data_close(Data *data);
+///
+size_t data_tell(Data *data);
+///
+size_t data_size(Data *data);
+///
+bool data_seek(Data *data, ssize_t delta);
+///
+bool data_jump(Data *data, ssize_t offset);
+///
+bool data_read(Data *data, uint8_t *buffer, size_t size, size_t *nread);
+///
+bool data_write(Data *data, const uint8_t *buffer, size_t size, size_t *nwritten);
 
 /// @}
 
-#endif // ETRIPATOR_OPCODES_H
+#endif // ETRIPATOR_DATA_H

include/etripator/disasm.h

@@ -0,0 +1,43 @@
+/*
+¬°¤*,¸¸,*¤°¬¯¬°¤*,¸_¸,*¤°¬°¤*,¸,*¤°¬¯¬°¤*,¸_¸,*¤°¬°¤*,¸,*¤°¬¯¬°¤*,¸_¸,*¤°¬°¤*,¸
+¸,*¤°¬¯¬°¤*,¸_¸,*¤°¬°¤*,¸,*¤°¬¯¬°¤*,¸_¸,*¤°¬°¤*,¸,*¤°¬¯¬°¤*,¸_¸,*¤°¬°¤*,¸,*¤°¬¯
+
+  __/¯\____ ___/\__   _/\__   _/\_   _/\__   _/\___ ___/\__   __/\_   _/\__   
+  \_  ____/_> ____ \_/  _  \_ \  <  /_    \_/     _>> ____ \_ >    \_/  _  \_ 
+  _> ___/ ¯>__> <<__// __  _/ |>  ></ _/>  </  ¯  \\__> <<__//  /\  // __  _/ 
+ _>  \7   <__/:. \__/:. \>  \_/   L/  _____/.  7> .\_/:. \__/  <_/ </:. \>  \_ 
+|:::::::::::::::::::::::/:::::::::::::>::::::::/::::::::::::::::::::::::/:::::|
+|¯¯\::::/\:/¯\::::/¯¯¯¯<::::/\::/¯¯\:/¯¯¯¯¯¯\::\::/¯¯\::::/¯¯\::::/¯¯¯¯<::::/¯|
+|__ |¯¯|  T _ |¯¯¯| ___ |¯¯|  |¯| _ T ______ |¯¯¯¯| _ |¯¯¯| _ |¯¯¯| ___ |¯¯| _|
+   \|__|/\|/ \|___|/   \|__|/\|_|/ \|/      \|    |/ \|___|/ \|___|/dNo\|__|/  
+
+¬°¤*,¸¸,*¤°¬¯¬°¤*,¸_¸,*¤°¬°¤*,¸,*¤°¬¯¬°¤*,¸_¸,*¤°¬°¤*,¸,*¤°¬¯¬°¤*,¸_¸,*¤°¬°¤*,¸
+¸,*¤°¬¯¬°¤*,¸_¸,*¤°¬°¤*,¸,*¤°¬¯¬°¤*,¸_¸,*¤°¬°¤*,¸,*¤°¬¯¬°¤*,¸_¸,*¤°¬°¤*,¸,*¤°¬¯
+
+  This file is part of Etripator,
+  copyright (c) 2009--2026 Vincent Cruz.
+ 
+  Etripator is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+ 
+  Etripator is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+ 
+  You should have received a copy of the GNU General Public License
+  along with Etripator.  If not, see <http://www.gnu.org/licenses/>.
+
+¬°¤*,¸¸,*¤°¬¯¬°¤*,¸_¸,*¤°¬°¤*,¸,*¤°¬¯¬°¤*,¸_¸,*¤°¬°¤*,¸,*¤°¬¯¬°¤*,¸_¸,*¤°¬°¤*,¸
+¸,*¤°¬¯¬°¤*,¸_¸,*¤°¬°¤*,¸,*¤°¬¯¬°¤*,¸_¸,*¤°¬°¤*,¸,*¤°¬¯¬°¤*,¸_¸,*¤°¬°¤*,¸,*¤°¬¯
+*/
+#ifndef ETRIPATOR_DISASM_H
+#define ETRIPATOR_DISASM_H
+
+#include "config.h"
+
+// [todo] nothing atm
+
+#endif // ETRIPATOR_DISASM_H

ipl.h include/etripator/ipl.hipl.h renamed to include/etripator/ipl.h

@@ -36,7 +36,7 @@
 #ifndef ETRIPATOR_LABEL_H
 #define ETRIPATOR_LABEL_H
 
-#include "config.h"
+#include <etripator/config.h>
 
 /// Label.
 typedef struct {