Finished implemenation of commands to delete macros. Added the new commands to

[cc65] / src / ca65 / objcode.c

diff --git a/src/ca65/objcode.c b/src/ca65/objcode.c
index 890b52ceede625370fc0cd0a1e162df72ec24c8c..f9032a0764d4fc525d6061bb483943eea3644e30 100644 (file)
--- a/src/ca65/objcode.c
+++ b/src/ca65/objcode.c
@@ -6,8 +6,8 @@
 /*                                                                           */
 /*                                                                           */
 /*                                                                           */
-/* (C) 1998-2003 Ullrich von Bassewitz                                       */
-/*               Römerstraße 52                                              */
+/* (C) 1998-2008 Ullrich von Bassewitz                                       */
+/*               Roemerstrasse 52                                            */
 /*               D-70794 Filderstadt                                         */
 /* EMail:        uz@cc65.org                                                 */
 /*                                                                           */
@@ -86,16 +86,6 @@ void Emit3 (unsigned char OPC, ExprNode* Expr)
 
 
 
-void Emit3b (unsigned char OPC, ExprNode* Expr, ExprNode* Bank)
-/* Emit an instruction with a three byte argument and separate bank */
-{
-    Emit0 (OPC);
-    EmitWord (Expr);
-    EmitByte (Bank);
-}
-
-
-
 void EmitSigned (ExprNode* Expr, unsigned Size)
 /* Emit a signed expression with the given size */
 {
@@ -114,15 +104,18 @@ void EmitPCRel (unsigned char OPC, ExprNode* Expr, unsigned Size)
 
 
 
-void EmitData (const unsigned char* Data, unsigned Size)
+void EmitData (const void* D, unsigned Size)
 /* Emit data into the current segment */
 {
+    /* Make a useful pointer from Data */
+    const unsigned char* Data = D;
+
     /* Create lots of fragments for the data */
     while (Size) {
-       Fragment* F;
+       Fragment* F;
 
-       /* Determine the length of the next fragment */
-       unsigned Len = Size;
+       /* Determine the length of the next fragment */
+       unsigned Len = Size;
                if (Len > sizeof (F->V.Data)) {
            Len = sizeof (F->V.Data);
                }
@@ -142,24 +135,23 @@ void EmitData (const unsigned char* Data, unsigned Size)
 
 
 
+void EmitStrBuf (const StrBuf* Data)
+/* Emit a string into the current segment */
+{
+    /* Use EmitData to output the data */
+    EmitData (SB_GetConstBuf (Data), SB_GetLen (Data));
+}
+
+
+
 void EmitByte (ExprNode* Expr)
 /* Emit one byte */
-{                  
-    long Val;
-    if (IsConstExpr (Expr, &Val)) {
-       /* Constant expression, emit literal byte */
-       FreeExpr (Expr);
-       if ((Val & ~0xFF) != 0) {
-           Error ("Range error");
-       }
-       Emit0 (Val & 0xFF);
-    } else {
-       /* Create a new fragment */
-       Fragment* F = GenFragment (FRAG_EXPR, 1);
+{
+    /* Create a new fragment */
+    Fragment* F = GenFragment (FRAG_EXPR, 1);
 
-       /* Set the data */
-       F->V.Expr = Expr;
-    }
+    /* Set the data */
+    F->V.Expr = Expr;
 }
 
 
@@ -167,22 +159,11 @@ void EmitByte (ExprNode* Expr)
 void EmitWord (ExprNode* Expr)
 /* Emit one word */
 {
-    long Val;
-    if (IsConstExpr (Expr, &Val)) {
-       /* Constant expression, emit literal byte */
-       FreeExpr (Expr);
-               if ((Val & ~0xFFFF) != 0) {
-           Error ("Range error");
-       }
-       Emit0 (Val & 0xFF);
-       Emit0 ((Val >> 8) & 0xFF);
-    } else {
-       /* Create a new fragment */
-       Fragment* F = GenFragment (FRAG_EXPR, 2);
+    /* Create a new fragment */
+    Fragment* F = GenFragment (FRAG_EXPR, 2);
 
-       /* Set the data */
-       F->V.Expr = Expr;
-    }
+    /* Set the data */
+    F->V.Expr = Expr;
 }
 
 
@@ -190,23 +171,11 @@ void EmitWord (ExprNode* Expr)
 void EmitFarAddr (ExprNode* Expr)
 /* Emit a 24 bit expression */
 {
-    long Val;
-    if (IsConstExpr (Expr, &Val)) {
-       /* Constant expression, emit literal byte */
-       FreeExpr (Expr);
-               if ((Val & ~0xFFFFFF) != 0) {
-           Error ("Range error");
-       }
-       Emit0 (Val & 0xFF);
-       Emit0 ((Val >> 8) & 0xFF);
-       Emit0 ((Val >> 16) & 0xFF);
-    } else {
-       /* Create a new fragment */
-       Fragment* F = GenFragment (FRAG_EXPR, 3);
+    /* Create a new fragment */
+    Fragment* F = GenFragment (FRAG_EXPR, 3);
 
-       /* Set the data */
-       F->V.Expr = Expr;
-    }
+    /* Set the data */
+    F->V.Expr = Expr;
 }
 
 
@@ -214,21 +183,11 @@ void EmitFarAddr (ExprNode* Expr)
 void EmitDWord (ExprNode* Expr)
 /* Emit one dword */
 {
-    long Val;
-    if (IsConstExpr (Expr, &Val)) {
-       /* Constant expression, emit literal byte */
-       FreeExpr (Expr);
-       Emit0 (Val & 0xFF);
-       Emit0 ((Val >> 8) & 0xFF);
-               Emit0 ((Val >> 16) & 0xFF);
-       Emit0 ((Val >> 24) & 0xFF);
-    } else {
-       /* Create a new fragment */
-       Fragment* F = GenFragment (FRAG_EXPR, 4);
+    /* Create a new fragment */
+    Fragment* F = GenFragment (FRAG_EXPR, 4);
 
-       /* Set the data */
-       F->V.Expr = Expr;
-    }
+    /* Set the data */
+    F->V.Expr = Expr;
 }