major refactor of cpu code

1 files changed, 6 insertions, 11 deletions

diff --git a/src/cpu/addressing.h b/src/cpu/addressing.h
index 790b912..d8f12a3 100644
--- a/src/cpu/addressing.h
+++ b/src/cpu/addressing.h
@@ -3,17 +3,12 @@
 
 #pragma once
 
-#include"core.h"
-#include"6502.h"
-#include"instructions.h"
-
-
-#define getInstructionLength(c) fAddressGetLength(*GetInstructionTableAddressing(c))
-
+#include "core.h"
+#include "6502.h"
+#include "instructions.h"
 
 // For a given addressing mode and opcode, return data about the instruction.
-AddData fAddress           (Addressing mode, address x              );
-address fAddressGetAddress (Addressing mode, address x              );
-int     fAddressGetLength  (Addressing mode                       );
+struct State fAddress           (Addressing mode, address x);
+address fAddressGetAddress (Addressing mode, address x);
+int     fAddressGetLength  (Addressing mode);
 byte    fAddressGetValue   (Addressing mode, address x, address addr);
-int     fAddressGetCycles  (Addressing mode, address x, address addr);