From 4e41bd67ec8428b6accd4a610a8114f1cea0e419 Mon Sep 17 00:00:00 2001
From: Michael Brown
Date: Fri, 18 Sep 2009 04:37:28 +0100
Subject: [import] Import version 1.26

http://www.memtest.org/download/1.26/memtest86+-1.26.tar.gz
---
 controller.c     |  15 +++++++--------
 init.c           |  12 ++++++++++--
 mt86+_loader.asm |   4 ++--
 mt86+_loader.bin | Bin 784 -> 784 bytes
 precomp.bin      | Bin 86948 -> 81860 bytes
 5 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/controller.c b/controller.c
index 67278f9..3665472 100644
--- a/controller.c
+++ b/controller.c
@@ -3,7 +3,7 @@
  * Released under version 2 of the Gnu Public License.
  * By Chris Brady, cbrady@sgi.com
  * ----------------------------------------------------
- * MemTest86+ V1.25 Specific code (GPL V2.0)
+ * MemTest86+ V1.26 Specific code (GPL V2.0)
  * By Samuel DEMEULEMEESTER, sdemeule@memtest.org
  * http://www.x86-secret.com - http://www.memtest.org
  */
@@ -846,14 +846,13 @@ static void poll_fsb_i925(void) {
 
 	double dramclock, dramratio, fsb;
 	unsigned int msr_lo, msr_hi;
-	unsigned long mchcfg, dev0;
+	unsigned long mchcfg, mchcfg2, dev0;
 	int coef;
 	long *ptr;
 	
 	/* Find multiplier (by MSR) */
 	rdmsr(0x2C, msr_lo, msr_hi);
 	coef = (msr_lo >> 24) & 0x1F;
-	fsb = ((extclock /1000) / coef);
 	
 	/* Find dramratio */
 	pci_conf_read( 0, 0, 0, 0x44, 4, &dev0);
@@ -861,17 +860,17 @@ static void poll_fsb_i925(void) {
 	mchcfg = *ptr & 0xFFFF;
 	dramratio = 1;
 
-	mchcfg = (mchcfg >> 4)&3;
+	mchcfg2 = (mchcfg >> 4)&3;
 	
-	if (mchcfg == 2) { dramratio = 1; } 
-	else if (mchcfg == 1) { dramratio = 0.66667; }
-	else if (mchcfg == 3) { 
+	if (mchcfg2  == 2) { dramratio = 1; } 
+	else if (mchcfg2 == 1) { dramratio = 0.66667; }
+	else if (mchcfg2 == 3) { 
 		// If mchcfg[0] = 1 => FSB533 / = 0 => FSB800
 		if ((mchcfg & 1) == 0) { dramratio = 1.33334; }
 		else { dramratio = 1.5; }
 	}
 
-
+	
 	// Compute RAM Frequency 
 	fsb = ((extclock /1000) / coef);
 	dramclock = fsb * dramratio;
diff --git a/init.c b/init.c
index e7b2508..1b7566b 100644
--- a/init.c
+++ b/init.c
@@ -3,7 +3,7 @@
  * Released under version 2 of the Gnu Public License.
  * By Chris Brady, cbrady@sgi.com
  * ----------------------------------------------------
- * MemTest86+ V1.25 Specific code (GPL V2.0)
+ * MemTest86+ V1.26 Specific code (GPL V2.0)
  * By Samuel DEMEULEMEESTER, sdemeule@memtest.org
  * http://www.x86-secret.com - http://www.memtest.org
  */
@@ -51,7 +51,7 @@ static void display_init(void)
  	for(i=0, pp=(char *)(SCREEN_ADR+1); i<TITLE_WIDTH; i++, pp+=2) {
   	*pp = 0x20;
  	}
- 	cprint(0, 0, "      Memtest86  v1.25      ");
+ 	cprint(0, 0, "      Memtest86  v1.26      ");
 
  	for(i=0, pp=(char *)(SCREEN_ADR+1); i<2; i++, pp+=30) {
 	*pp = 0xA4;
@@ -383,6 +383,14 @@ void cpu_type(void)
 				l2_cache = (cpu_id.cache_info[11] << 8);
 				l2_cache += cpu_id.cache_info[10];
 				break;
+			case 13: 
+				cprint(LINE_CPU, 0, "AMD K6-III+"); 
+				off = 11; 
+				l1_cache = cpu_id.cache_info[3]; 
+				l1_cache += cpu_id.cache_info[7]; 
+				l2_cache = (cpu_id.cache_info[11] << 8); 
+				l2_cache += cpu_id.cache_info[10]; 
+				break;
 			}
 			break;
 		case 6:
diff --git a/mt86+_loader.asm b/mt86+_loader.asm
index 38825be..da192ec 100644
--- a/mt86+_loader.asm
+++ b/mt86+_loader.asm
@@ -12,8 +12,8 @@
 ; The good thing is that you get a single file which can be
 ; compressed, for example with http://upx.sf.net/ (UPX).
 
-%define fullsize (86948 + buffer - start)
-	; 84420 is the size of memtest86+ V1.25, adjust as needed!
+%define fullsize (81860 + buffer - start)
+	; 81860 is the size of memtest86+ V1.26, adjust as needed!
 
 %define stacksize 2048
 %define stackpara ((stacksize + 15) / 16)
diff --git a/mt86+_loader.bin b/mt86+_loader.bin
index 75eeb7a..38730ee 100644
Binary files a/mt86+_loader.bin and b/mt86+_loader.bin differ
diff --git a/precomp.bin b/precomp.bin
index f937573..c607ff5 100755
Binary files a/precomp.bin and b/precomp.bin differ
-- 
cgit v1.2.3-55-g7522