---1463801343-785353032-877801121=:4945
Content-Type: TEXT/PLAIN; charset=US-ASCII
I've completely re-done the whatever-86 cpu identification to correctly
identify what (I hope is) all CPUs...
Please give it a test and let me know... I'm hoping to have this put in
the main distribution at some point in time...
The patch will apply cleanly to stock 2.1.5[789] and 2.1.60,and compiles.
I've "tested the amd5model() output since that's what I've got, so any
others would be greatly appreciated!
Pat
-- +----------------------------------------------------------------------------+ | Patrick St. Jean '97 XLH 883 psj@cgmlarson.com | | Programmer & Systems Administrator +1 713-977-4177 x106 | | Larson Software Technology http://www.cgmlarson.com | +----------------------------------------------------------------------------+---1463801343-785353032-877801121=:4945 Content-Type: TEXT/PLAIN; charset=US-ASCII; name="cpu_detection.patch" Content-Transfer-Encoding: BASE64 Content-ID: <Pine.LNX.3.96.971025123841.4945B@zaphod.cgmlarson.com> Content-Description:
LS0tIHNldHVwLmMub3JpZwlNb24gT2N0IDIwIDE1OjUxOjE3IDE5OTcNCisr KyBzZXR1cC5jCVR1ZSBPY3QgMjEgMTQ6MjM6MjIgMTk5Nw0KQEAgLTIzMSwx MSArMjMxLDQ0IEBADQogCXJlcXVlc3RfcmVnaW9uKDB4ZjAsMHgxMCwiZnB1 Iik7DQogfQ0KIA0KK3N0YXRpYyBjb25zdCBjaGFyICogYW1kNG1vZGVsKHVu c2lnbmVkIGludCBucikNCit7DQorCXN0YXRpYyBjb25zdCBjaGFyICptb2Rl bFtdID0gew0KKwkJIjAiLCAiMSIsICIyIiwgIkRYLzIiLCAiNCIsICI1Iiwg IjYiLCAiRFgvMi1XQiIsICJEWC80IiwNCisJCSJEWC80LVdCIiwgIkEiLCAi QiIsICJDIiwgIkQiLCJBbTV4ODYtV1QiLCJBbTV4ODYtV0IiDQorCX07DQor CWlmIChuciA8IHNpemVvZihtb2RlbCkvc2l6ZW9mKGNoYXIgKikpDQorCQly ZXR1cm4gbW9kZWxbbnJdOw0KKwlyZXR1cm4gTlVMTDsNCit9DQorDQorc3Rh dGljIGNvbnN0IGNoYXIgKiBjeXJpeDRtb2RlbCh1bnNpZ25lZCBpbnQgbnIp DQorew0KKwlzdGF0aWMgY29uc3QgY2hhciAqbW9kZWxbXSA9IHsNCisJCSIw IiwgIjEiLCAiMiIsICIzIiwgIk1lZGlhR1giLCAiNSIsICI2IiwgIjciLCAi OCIsICI1eDg2IiwNCisJCSJBIiwgIkIiLCAiQyIsICJEIiwgIkUiLCAiRiIN CisJfTsNCisJaWYgKG5yIDwgc2l6ZW9mKG1vZGVsKS9zaXplb2YoY2hhciAq KSkNCisJCXJldHVybiBtb2RlbFtucl07DQorCXJldHVybiBOVUxMOw0KK30N CisNCitzdGF0aWMgY29uc3QgY2hhciAqIHVtYzRtb2RlbCh1bnNpZ25lZCBp bnQgbnIpDQorew0KKwlzdGF0aWMgY29uc3QgY2hhciAqbW9kZWxbXSA9IHsN CisJCSIwIiwgIlU1RCIsICJVNVMiLCAiMyIsICI0IiwgIjUiLCAiNiIsICI3 IiwgIjgiLCAiOSIsDQorCQkiQSIsICJCIiwgIkMiLCAiRCIsICJFIiwgIkYi DQorCX07DQorCWlmIChuciA8IHNpemVvZihtb2RlbCkvc2l6ZW9mKGNoYXIg KikpDQorCQlyZXR1cm4gbW9kZWxbbnJdOw0KKwlyZXR1cm4gTlVMTDsNCit9 DQorDQogc3RhdGljIGNvbnN0IGNoYXIgKiBpNDg2bW9kZWwodW5zaWduZWQg aW50IG5yKQ0KIHsNCiAJc3RhdGljIGNvbnN0IGNoYXIgKm1vZGVsW10gPSB7 DQotCQkiMCIsIkRYIiwiU1giLCJEWC8yIiwiNCIsIlNYLzIiLCI2IiwiRFgv Mi1XQiIsIkRYLzQiLCJEWC80LVdCIiwNCi0JCSIxMCIsIjExIiwiMTIiLCIx MyIsIkFtNXg4Ni1XVCIsIkFtNXg4Ni1XQiINCisJCSJEWC0yNS8zMyIsICJE WC01MCIsICJTWCIsICJEWC8yIiwgIlNMIiwgIlNYLzIiLCAiNiIsDQorCQki RFgvMi1XQiIsICJEWC80IiwgIkRYLzQtV0IiLCAiQSIsICJCIiwgIkMiLCAi RCIsICJFIiwgIkYiDQogCX07DQogCWlmIChuciA8IHNpemVvZihtb2RlbCkv c2l6ZW9mKGNoYXIgKikpDQogCQlyZXR1cm4gbW9kZWxbbnJdOw0KQEAgLTI0 NSwyMCArMjc4LDY2IEBADQogc3RhdGljIGNvbnN0IGNoYXIgKiBpNTg2bW9k ZWwodW5zaWduZWQgaW50IG5yKQ0KIHsNCiAJc3RhdGljIGNvbnN0IGNoYXIg Km1vZGVsW10gPSB7DQotCQkiMCIsICJQZW50aXVtIDYwLzY2IiwiUGVudGl1 bSA3NSsiLCJPdmVyRHJpdmUgUE9EUDVWODMiLA0KLQkJIlBlbnRpdW0gTU1Y Ig0KKwkJIlBlbnRpdW0gNjAvNjYgQS1zdGVwIiwgIlBlbnRpdW0gNjAvNjYi LCAiUGVudGl1bSA3NSsiLA0KKwkJIk92ZXJEcml2ZSBQT0RQNVY4MyIsICJQ ZW50aXVtIE1NWCIsICI1IiwgIjYiLCAiUGVudGl1bSA3NSsiLA0KKwkJIjgi LCAiOSIsICJBIiwgIkIiLCAiQyIsICJEIiwgIkUiLCAiRiINCisJfTsNCisJ aWYgKG5yIDwgc2l6ZW9mKG1vZGVsKS9zaXplb2YoY2hhciAqKSkNCisJCXJl dHVybiBtb2RlbFtucl07DQorCXJldHVybiBOVUxMOw0KK30NCisNCitzdGF0 aWMgY29uc3QgY2hhciAqIGFtZDVtb2RlbCh1bnNpZ25lZCBpbnQgbnIpDQor ew0KKwlzdGF0aWMgY29uc3QgY2hhciAqbW9kZWxbXSA9IHsNCisJCSJLNS9T U0E1IChQUi03NSwgUFItOTAsIFBSLTEwMCkiLCAiSzUgKFBSLTEyMCwgUFIt MTMzKSIsDQorCQkiSzUgKFBSLTE2NikiLCAiSzUgKFBSLTIwMCkiLCAiNCIs ICI1IiwgDQorCQkiSzYgKDE2NiAtIDI2NikiLCAiSzYgKDE2NiAtIDMwMCki LCAiSzYgKG1vZGVsIDgpIiwNCisJCSJLNiAobW9kZWwgOSkiLCAiQSIsICJC IiwgIkMiLCAiRCIsICJFIiwgIkYiDQogCX07DQogCWlmIChuciA8IHNpemVv Zihtb2RlbCkvc2l6ZW9mKGNoYXIgKikpDQogCQlyZXR1cm4gbW9kZWxbbnJd Ow0KIAlyZXR1cm4gTlVMTDsNCiB9DQogDQotc3RhdGljIGNvbnN0IGNoYXIg KiBrNW1vZGVsKHVuc2lnbmVkIGludCBucikNCitzdGF0aWMgY29uc3QgY2hh ciAqIGNlbnRhdXI1bW9kZWwodW5zaWduZWQgaW50IG5yKQ0KIHsNCiAJc3Rh dGljIGNvbnN0IGNoYXIgKm1vZGVsW10gPSB7DQotCQkiU1NBNSAoUFItNzUs IFBSLTkwLCBQUi0xMDApIiwgIjVrODYgKFBSLTEyMCwgUFItMTMzKSIsDQot CQkiNWs4NiAoUFItMTY2KSIsICI1azg2IChQUi0yMDApIiwgIiIsICIiLCAN Ci0JCSJLNihQUi0xMzMuLlBSLTE2NikiLCJLNihQUi0xMzMuLlBSLTIwMCki DQorCQkiMCIsICIxIiwgIjIiLCAiMyIsICJDNiIsICI1IiwgIjYiLCAiNyIs ICI4IiwgIjkiLCAiQSIsDQorCQkiQiIsICJDIiwgIkQiLCAiRSIsICJGIg0K Kwl9Ow0KKwlpZiAobnIgPCBzaXplb2YobW9kZWwpL3NpemVvZihjaGFyICop KQ0KKwkJcmV0dXJuIG1vZGVsW25yXTsNCisJcmV0dXJuIE5VTEw7DQorfQ0K Kw0KK3N0YXRpYyBjb25zdCBjaGFyICogY3lyaXg1bW9kZWwodW5zaWduZWQg aW50IG5yKQ0KK3sNCisJc3RhdGljIGNvbnN0IGNoYXIgKm1vZGVsW10gPSB7 DQorCQkiMCIsICIxIiwgIjZ4ODYiLCAiMyIsICJNZWRpYUdYIHdpdGggTU1Y IiwgIjUiLCAiNiIsICI3IiwgIjgiLA0KKwkJIjkiLCAiQSIsICJCIiwgIkMi LCAiRCIsICJFIiwgIkYiDQorCX07DQorCWlmIChuciA8IHNpemVvZihtb2Rl bCkvc2l6ZW9mKGNoYXIgKikpDQorCQlyZXR1cm4gbW9kZWxbbnJdOw0KKwly ZXR1cm4gTlVMTDsNCit9DQorDQorc3RhdGljIGNvbnN0IGNoYXIgKiBuZXhn ZW41bW9kZWwodW5zaWduZWQgaW50IG5yKQ0KK3sNCisJc3RhdGljIGNvbnN0 IGNoYXIgKm1vZGVsW10gPSB7DQorCQkiTng1ODYiLCAiMSIsICIyIiwgIjMi LCAiNCIsICI1IiwgIjYiLCAiNyIsICI4IiwNCisJCSI5IiwgIkEiLCAiQiIs ICJDIiwgIkQiLCAiRSIsICJGIg0KKwl9Ow0KKwlpZiAobnIgPCBzaXplb2Yo bW9kZWwpL3NpemVvZihjaGFyICopKQ0KKwkJcmV0dXJuIG1vZGVsW25yXTsN CisJcmV0dXJuIE5VTEw7DQorfQ0KKw0KK3N0YXRpYyBjb25zdCBjaGFyICog Y3lyaXg2bW9kZWwodW5zaWduZWQgaW50IG5yKQ0KK3sNCisJc3RhdGljIGNv bnN0IGNoYXIgKm1vZGVsW10gPSB7DQorCQkiNng4Nk1YIiwgIjEiLCAiMiIs ICIzIiwgIjQiLCAiNSIsICI2IiwgIjciLCAiOCIsICI5IiwgIkEiLA0KKwkJ IkIiLCAiQyIsICJEIiwgIkUiLCAiRiINCiAJfTsNCiAJaWYgKG5yIDwgc2l6 ZW9mKG1vZGVsKS9zaXplb2YoY2hhciAqKSkNCiAJCXJldHVybiBtb2RlbFtu cl07DQpAQCAtMjY4LDcgKzM0Nyw4IEBADQogc3RhdGljIGNvbnN0IGNoYXIg KiBpNjg2bW9kZWwodW5zaWduZWQgaW50IG5yKQ0KIHsNCiAJc3RhdGljIGNv bnN0IGNoYXIgKm1vZGVsW10gPSB7DQotCQkiUFBybyBBLXN0ZXAiLCAiUGVu dGl1bSBQcm8iLCAiMiIsICJQZW50aXVtIElJIg0KKwkJIlBlbnRpdW0gUHJv IEEtc3RlcCIsICJQZW50aXVtIFBybyIsICIyIiwgIlBlbnRpdW0gSUkiLCAi NCIsDQorCQkiNSIsICI2IiwgIjciLCAiOCIsICI5IiwgIkEiLCAiQiIsICJD IiwgIkQiLCAiRSIsICJGIg0KIAl9Ow0KIAlpZiAobnIgPCBzaXplb2YobW9k ZWwpL3NpemVvZihjaGFyICopKQ0KIAkJcmV0dXJuIG1vZGVsW25yXTsNCkBA IC0yODEsMTcgKzM2MSwzNSBAQA0KICAgICAgICAgc3RhdGljIGNoYXIgbmJ1 ZlsxMl07DQogCXN3aXRjaCAoeDg2KSB7DQogCQljYXNlIDQ6DQotCQkJcCA9 IGk0ODZtb2RlbChtb2RlbCk7DQorCQkJaWYgKCFzdHJjbXAoeDg2X3ZlbmRv cl9pZCwgIkF1dGhlbnRpY0FNRCIpKXsNCisJCQkJcCA9IGFtZDRtb2RlbCht b2RlbCk7DQorCQkJfWVsc2UgaWYgKCFzdHJjbXAoeDg2X3ZlbmRvcl9pZCwg IkN5cml4SW5zdGVhZCIpKXsNCisJCQkJcCA9IGN5cml4NG1vZGVsKG1vZGVs KTsNCisJCQl9ZWxzZSBpZiAoIXN0cmNtcCh4ODZfdmVuZG9yX2lkLCAiVU1D IFVNQyBVTUMgIikpew0KKwkJCQlwID0gdW1jNG1vZGVsKG1vZGVsKTsNCisJ CQl9ZWxzZXsNCisJCQkJcCA9IGk0ODZtb2RlbChtb2RlbCk7DQorCQkJfQ0K IAkJCWJyZWFrOw0KIAkJY2FzZSA1Og0KLQkJCWlmKHN0cmNtcCh4ODZfdmVu ZG9yX2lkLCAiQXV0aGVudGljQU1EIikgPT0gMCl7DQotCQkJCXAgPSBrNW1v ZGVsKG1vZGVsKTsNCi0JCQl9IGVsc2Ugew0KKwkJCWlmICghc3RyY21wKHg4 Nl92ZW5kb3JfaWQsICJBdXRoZW50aWNBTUQiKSl7DQorCQkJCXAgPSBhbWQ1 bW9kZWwobW9kZWwpOw0KKwkJCX1lbHNlIGlmICghc3RyY21wKHg4Nl92ZW5k b3JfaWQsICJDZW50YXVySGF1bHMiKSl7DQorCQkJCXAgPSBjZW50YXVyNW1v ZGVsKG1vZGVsKTsNCisJCQl9ZWxzZSBpZiAoIXN0cmNtcCh4ODZfdmVuZG9y X2lkLCAiQ3lyaXhJbnN0ZWFkIikpew0KKwkJCQlwID0gY3lyaXg1bW9kZWwo bW9kZWwpOw0KKwkJCX1lbHNlIGlmICghc3RyY21wKHg4Nl92ZW5kb3JfaWQs ICJOZXhHZW5Ecml2ZW4iKSl7DQorCQkJCXAgPSBuZXhnZW41bW9kZWwobW9k ZWwpOw0KKwkJCX1lbHNlew0KIAkJCQlwID0gaTU4Nm1vZGVsKG1vZGVsKTsN CiAJCQl9DQogCQkJYnJlYWs7DQogCQljYXNlIDY6DQotCQkJcCA9IGk2ODZt b2RlbChtb2RlbCk7DQorCQkJaWYgKCFzdHJjbXAoeDg2X3ZlbmRvcl9pZCwg IkN5cml4SW5zdGVhZCIpKXsNCisJCQkJcCA9IGN5cml4Nm1vZGVsKG1vZGVs KTsNCisJCQl9ZWxzZXsNCisJCQkJcCA9IGk2ODZtb2RlbChtb2RlbCk7DQor CQkJfQ0KIAkJCWJyZWFrOw0KIAl9DQogICAgICAgICBpZiAocCkNCg== ---1463801343-785353032-877801121=:4945--