ecere/com: Avoid going through OnCopy() for units, bit classes and enums

diff --git a/ecere/src/com/containers/Map.ec b/ecere/src/com/containers/Map.ec
index 74c55a1..4d5d19e 100644 (file)
--- a/ecere/src/com/containers/Map.ec
+++ b/ecere/src/com/containers/Map.ec
@@ -203,7 +203,8 @@ public class Map<class MT, class V> : CustomAVLTree<MapNode<MT, V>, I = MT, D =
             node = MapNode<MT, V> { key = pos };
          }
          if((Tclass.type == systemClass && !Tclass.byValueSystemClass) || Tclass.type == bitClass || Tclass.type == enumClass || Tclass.type == unitClass)
-            onCopy(Tclass, (byte *)&node.key + __ENDIAN_PAD(Tclass.typeSize), (byte *)&pos + __ENDIAN_PAD(Tclass.typeSize));
+            // onCopy(Tclass, (byte *)&node.key + __ENDIAN_PAD(Tclass.typeSize), (byte *)&pos + __ENDIAN_PAD(Tclass.typeSize));
+            memcpy((byte *)&node.key + __ENDIAN_PAD(Tclass.typeSize), (byte *)&pos + __ENDIAN_PAD(Tclass.typeSize), Tclass.typeSize);
          else
             onCopy(Tclass, (byte *)&node.key + __ENDIAN_PAD(sizeof(void *)), (void *)pos);
          CustomAVLTree::AddEx((T)(uintptr)node, (T)(uintptr)addNode, addSide);

diff --git a/ecere/src/com/dataTypes.ec b/ecere/src/com/dataTypes.ec
index d4812fd..644c40f 100644 (file)
--- a/ecere/src/com/dataTypes.ec
+++ b/ecere/src/com/dataTypes.ec
@@ -1106,12 +1106,18 @@ static bool OnGetDataFromString(Class _class, void ** data, const char * string)
 
 static void OnCopy(Class _class, void ** data, void * newData)
 {
-   // TO IMPROVE: Inherit from Unit class for better performance?
    if(_class.type == unitClass || _class.type == bitClass || _class.type == enumClass)
    {
+      // An OnCopy is pointless for these, just copy the value
+      /*
       Class dataType = eSystem_FindClass(_class.module, _class.dataTypeString);
       if(dataType)
          ((void (*)(void *, void *, void *))(void *)dataType._vTbl[__ecereVMethodID_class_OnCopy])(dataType, data, newData);
+      */
+      if(newData)
+         memcpy(data, newData, _class.typeSize);
+      else
+         memset(data, 0, _class.typeSize);
    }
    else if(_class.type != structClass && (_class.type != systemClass || _class.byValueSystemClass))
    {