Browse Source

Fixed bugs (Linux FPC MurMurFast no assembler)

PascalCoin 5 years ago
parent
commit
bd60985b46
3 changed files with 7 additions and 2 deletions
  1. 4 1
      src/core/UMurMur3Fast.pas
  2. 1 1
      src/core/UNode.pas
  3. 2 0
      src/core/UPoolMining.pas

+ 4 - 1
src/core/UMurMur3Fast.pas

@@ -18,6 +18,10 @@ unit UMurMur3Fast;
 
 {$IFDEF FPC}
   {$MODE delphi}
+  {$OVERFLOWCHECKS OFF}
+  {$RANGECHECKS OFF}
+  {$POINTERMATH ON}
+  {$DEFINE no_assembler} // FPC will not use assembler (error on Linux)
 {$ENDIF}
 
 interface
@@ -285,7 +289,6 @@ const
   n = $E6546B64;
   f1 = $85EBCA6B;
   f2 = $C2B2AE35;
-{.$DEFINE no_assembler} // Active only for non assembler
 {$IFDEF no_assembler}
 var
   i, Len2: integer;

+ 1 - 1
src/core/UNode.pas

@@ -877,7 +877,7 @@ end;
 
 class function TNode.NodeVersion: String;
 begin
-  Result := CT_ClientAppVersion{$IFDEF LINUX}+'L'{$ELSE}+'W'{$ENDIF}{$IFDEF FPC}{$IFDEF LCL}+'l'{$ELSE}+'f'{$ENDIF}{$ENDIF}{$IFDEF FPC}{$IFDEF CPU32}+'32b'{$ELSE}+'64b'{$ENDIF}{$ELSE}{$IFDEF CPU32BITS}+'32b'{$ELSE}+'64b'{$ENDIF}{$ENDIF}+'o';
+  Result := CT_ClientAppVersion{$IFDEF LINUX}+'L'{$ELSE}+'W'{$ENDIF}{$IFDEF FPC}{$IFDEF LCL}+'l'{$ELSE}+'f'{$ENDIF}{$ENDIF}{$IFDEF FPC}{$IFDEF CPU32}+'32b'{$ELSE}+'64b'{$ENDIF}{$ELSE}{$IFDEF CPU32BITS}+'32b'{$ELSE}+'64b'{$ENDIF}{$ENDIF};
 end;
 
 procedure TNode.Notification(AComponent: TComponent; Operation: TOperation);

+ 2 - 0
src/core/UPoolMining.pas

@@ -1299,6 +1299,8 @@ begin
       end;
       MinerValuesForWork := mvfw;
     end else TLog.NewLog(ltError,ClassName,'method '+method+' without JSON object '+params.ToJSON(false));
+  end else if (method=CT_PoolMining_Method_MINER_SUBMIT) then begin
+    //
   end else if (method=CT_PoolMining_Method_STRATUM_MINING_AUTHORIZE) And
     (PoolType=ptPoolSubscription) And (Assigned(params_as_array)) then begin
     //