Working on predictions and the npcap is not working correctly

JKBert · Jun 22, 2019 · ed26b64 · ed26b64
1 parent 1e6d3b6
commit ed26b64
Show file tree

Hide file tree

Showing 10 changed files with 7,808,301 additions and 14 deletions.
diff --git a/DECaxp/CMakeLists.txt b/DECaxp/CMakeLists.txt
@@ -36,7 +36,7 @@ target_link_libraries(DECaxp_Generate_SROM PRIVATE
     -lxml2
     -lm
     -liconv
-    /cygdrive/c/WINDOWS/system32/wpcap.dll)
+    /cygdrive/c/WINDOWS/system32/npcap/wpcap.dll)
 
 target_include_directories(DECaxp_Generate_SROM PRIVATE
     ${PROJECT_SOURCE_DIR}/Includes)

diff --git a/Includes/CPU/Ibox/AXP_21264_Predictions.h b/Includes/CPU/Ibox/AXP_21264_Predictions.h
@@ -114,7 +114,7 @@ typedef struct
  * The way this table work is, if the local and global predictions do not
  * match, if the local prediction was correct, then we decrement the 2-bit
  * saturation counter.  Otherwise, we increment the 2-bit saturation counter.
- * If the local and golbal predictions match, we leave the counter alone.
+ * If the local and global predictions match, we leave the counter alone.
  */
 typedef struct
 {
@@ -140,7 +140,7 @@ typedef struct
  * The DECR is called when a branch is not actually taken.
  *
  * NOTE:	We do the following, when incrementing and decrementing, to be able
- *			to provide a bit of a historesis, to precent alternating between
+ *			to provide a bit of a hysteresis, to percent alternating between
  *			the FAVORS_NOT_TAKEN and FAVORS_TAKEN states.  Alternating between
  *			taken and not taken will still properly predict the branch 50% of
  *			the time.

diff --git a/Includes/Devices/Ethernet/AXP_Ethernet.h b/Includes/Devices/Ethernet/AXP_Ethernet.h
@@ -28,7 +28,7 @@
 #ifndef _AXP_ETHERNET_H_
 #define _AXP_ETHERNET_H_
 #define HAVE_REMOTE	1
-#include <pcap.h>
+#include <pcap/pcap.h>
 
 #define AXP_ETH_READ_TIMEOUT	1000
 #define AXP_MAC_ADDR_LEN	6

diff --git a/Tests/AXP_21264_Cache_Test.c b/Tests/AXP_21264_Cache_Test.c
@@ -127,7 +127,7 @@ int main()
 
     printf("\nAXP 21264 Data and Instruction Cache Tester\n");
     AXP_PUT_PC(zeroPC, zeroPCval);
-    line = AXP_Allocate_Block(-lineLen);
+    line = AXP_Allocate_Block(-lineLen, NULL);
     cpu = (AXP_21264_CPU *) AXP_Allocate_Block(AXP_21264_CPU_BLK);
 
     /*