diff --git a/docs/notework.txt b/docs/notework.txt index 31e115a..41a8dbd 100644 --- a/docs/notework.txt +++ b/docs/notework.txt @@ -10,6 +10,9 @@ ______________________________________________________________________ Notes for GoldED+ 1.1.5, /snapshot/ ______________________________________________________________________ + ++ Fix P4 and IA64 cpu detection. + + New reader key READfindnext (default: ^F6) added. READfindall and READfindheader will not search from next message, use READfindnext instead. diff --git a/goldlib/gall/gutlvers.cpp b/goldlib/gall/gutlvers.cpp index 032d4d9..4fbe588 100644 --- a/goldlib/gall/gutlvers.cpp +++ b/goldlib/gall/gutlvers.cpp @@ -350,12 +350,26 @@ char* ggetosstring(void) { case PROCESSOR_INTEL_486: cpu = 4; break; - default: + case PROCESSOR_INTEL_PENTIUM: cpu = 5; + case PROCESSOR_INTEL_IA64: + cpu = 64; + default: + cpu = 6; break; } } - sprintf(processor, "i%d86", cpu); + switch(cpu) { + case 15: + sprintf(processor, "i786"); + break; + case 64: + sprintf(processor, "IA64"); + break; + default: + if( cpu>9 ) cpu= cpu%10+int(cpu/10)+1; + sprintf(processor, "i%d86", cpu); + } } } break;