Updated some files (since they were moved)

scala-network · May 7, 2020 · 6e6f64a · 6e6f64a
1 parent 3968d95
commit 6e6f64a
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 907 deletions.
diff --git a/src/backend/cpu/CpuWorker.cpp b/src/backend/cpu/CpuWorker.cpp
@@ -42,7 +42,6 @@
 
 #ifdef XMRIG_ALGO_RANDOMX
 #   include "crypto/randomx/randomx.h"
-#   include "crypto/defyx/defyx.h"
 #endif
 
 

diff --git a/src/base/crypto/Algorithm.cpp b/src/base/crypto/Algorithm.cpp
@@ -117,6 +117,8 @@ static AlgoName const algorithm_names[] = {
     { "RandomSFX",                 nullptr,            Algorithm::RX_SFX          },
     { "randomx/keva",              "rx/keva",          Algorithm::RX_KEVA         },
     { "RandomKEVA",                nullptr,            Algorithm::RX_KEVA         },
+    { "DefyX",                     "defyx",            Algorithm::DEFYX           },
+    { "Panthera",                  "panthera",         Algorithm::RX_XLA          },	
 #   endif
 #   ifdef XMRIG_ALGO_ARGON2
     { "argon2/chukwa",             nullptr,            Algorithm::AR2_CHUKWA      },
@@ -152,6 +154,8 @@ size_t xmrig::Algorithm::l2() const
 
     case RX_WOW:
     case RX_KEVA:
+    case DEFYX:
+    case RX_XLA:	
         return 0x20000;
 
     case RX_ARQ:
@@ -203,6 +207,8 @@ size_t xmrig::Algorithm::l3() const
             return oneMiB;
 
         case RX_ARQ:
+        case DEFYX:
+        case RX_XLA:		
             return oneMiB / 4;
 
         default:
@@ -317,6 +323,8 @@ xmrig::Algorithm::Family xmrig::Algorithm::family(Id id)
     case RX_ARQ:
     case RX_SFX:
     case RX_KEVA:
+    case DEFYX:
+    case RX_XLA:	
         return RANDOM_X;
 #   endif
 

diff --git a/src/base/crypto/Algorithm.h b/src/base/crypto/Algorithm.h
@@ -73,6 +73,8 @@ class Algorithm
         AR2_CHUKWA,    // "argon2/chukwa"    Argon2id (Chukwa).
         AR2_WRKZ,      // "argon2/wrkz"      Argon2id (WRKZ)
         ASTROBWT_DERO, // "astrobwt"         AstroBWT (Dero)
+        DEFYX,         // "defyx"            DefyX (Scala).	
+        RX_XLA,        // "rx/xla"           Panthera (Scala).			
         MAX
     };
 

diff --git a/src/crypto/common/Algorithm.cpp b/src/crypto/common/Algorithm.cpp
-Original file line number
+Diff line change
@@ Expand Up / @@ -42,7 +42,6 @@ @@
     #ifdef XMRIG_ALGO_RANDOMX
     #   include "crypto/randomx/randomx.h"
-    #   include "crypto/defyx/defyx.h"
     #endif
@@ Expand Down @@