Fixed two compiler warnings.

[cc65] / src / cc65 / codeent.h

diff --git a/src/cc65/codeent.h b/src/cc65/codeent.h
index a78d77e8107f949fad7250add5835feddceeccf4..db3d17106472f7f9beaa66eff12d57f6a80252f7 100644 (file)
--- a/src/cc65/codeent.h
+++ b/src/cc65/codeent.h
@@ -6,10 +6,10 @@
 /*                                                                           */
 /*                                                                           */
 /*                                                                           */
-/* (C) 2001-2002 Ullrich von Bassewitz                                       */
-/*               Wacholderweg 14                                             */
-/*               D-70597 Stuttgart                                           */
-/* EMail:        uz@musoftware.de                                            */
+/* (C) 2001-2009, Ullrich von Bassewitz                                      */
+/*                Roemerstrasse 52                                           */
+/*                D-70794 Filderstadt                                        */
+/* EMail:         uz@cc65.org                                                */
 /*                                                                           */
 /*                                                                           */
 /* This software is provided 'as-is', without any expressed or implied       */
@@ -38,7 +38,6 @@
 
 
 
-#include <stdio.h>
 #include <string.h>
 
 /* common */
@@ -66,15 +65,15 @@
 /* Code entry structure */
 typedef struct CodeEntry CodeEntry;
 struct CodeEntry {
-    opc_t              OPC;            /* Opcode */
-    am_t               AM;             /* Adressing mode */
+    unsigned char       OPC;           /* Opcode */
+    unsigned char       AM;            /* Adressing mode */
+    unsigned char      Size;           /* Estimated size */
+    unsigned char       Flags;         /* Flags */
     char*                      Arg;            /* Argument as string */
     unsigned long      Num;            /* Numeric argument */
-    unsigned short     Flags;          /* Flags */
     unsigned short      Info;          /* Additional code info */
     unsigned short      Use;           /* Registers used */
     unsigned short      Chg;           /* Registers changed/destroyed */
-    unsigned char      Size;           /* Estimated size */
     CodeLabel*         JumpTo;         /* Jump label */
     Collection         Labels;         /* Labels for this instruction */
     LineInfo*           LI;             /* Source line info for this insn */
@@ -115,6 +114,12 @@ int CodeEntriesAreEqual (const CodeEntry* E1, const CodeEntry* E2);
 void CE_AttachLabel (CodeEntry* E, CodeLabel* L);
 /* Attach the label to the entry */
 
+void CE_ClearJumpTo (CodeEntry* E);
+/* Clear the JumpTo entry and the argument (which contained the name of the
+ * label). Note: The function will not clear the backpointer from the label,
+ * so use it with care.
+ */
+
 #if defined(HAVE_INLINE)
 INLINE int CE_HasLabel (const CodeEntry* E)
 /* Check if the given code entry has labels attached */
@@ -178,22 +183,30 @@ INLINE void CE_ResetMark (CodeEntry* E)
 #  define CE_ResetMark(E)      ((E)->Flags &= ~CEF_USERMARK)
 #endif
 
+void CE_SetArg (CodeEntry* E, const char* Arg);
+/* Replace the argument by the new one. */
+
 void CE_SetNumArg (CodeEntry* E, long Num);
 /* Set a new numeric argument for the given code entry that must already
  * have a numeric argument.
  */
 
-int CE_KnownImm (const CodeEntry* E);
-/* Return true if the argument of E is a known immediate value */
+int CE_IsConstImm (const CodeEntry* E);
+/* Return true if the argument of E is a constant immediate value */
+
+int CE_IsKnownImm (const CodeEntry* E, unsigned long Num);
+/* Return true if the argument of E is a constant immediate value that is
+ * equal to Num.
+ */
 
 #if defined(HAVE_INLINE)
-INLINE int CE_IsCall (const CodeEntry* E, const char* Name)
+INLINE int CE_IsCallTo (const CodeEntry* E, const char* Name)
 /* Check if this is a call to the given function */
 {
     return (E->OPC == OP65_JSR && strcmp (E->Arg, Name) == 0);
 }
 #else
-#  define CE_IsCall(E, Name) ((E)->OPC == OP65_JSR && strcmp ((E)->Arg, (Name)) == 0)
+#  define CE_IsCallTo(E, Name) ((E)->OPC == OP65_JSR && strcmp ((E)->Arg, (Name)) == 0)
 #endif
 
 int CE_UseLoadFlags (const CodeEntry* E);
@@ -209,8 +222,8 @@ void CE_GenRegInfo (CodeEntry* E, RegContents* InputRegs);
  * overwritten.
  */
 
-void CE_Output (const CodeEntry* E, FILE* F);
-/* Output the code entry to a file */
+void CE_Output (const CodeEntry* E);
+/* Output the code entry to the output file */