Well, I actually found my motherboard's manual and I read about the jumpers (seeing as how I've never messed with them before!) and according to the manual, it has always been set to safe/100 mode. But I changed it to user/default mode, and it wouldn't even get past the POST. I thought I had blown my video card because my monitor wouldn't switch on but when I eventually got it going, it said something about the CMOS setting itself to default. So whatever has happened, it's all very wierd!
Oh, and it still thinks it's an Athlon 1800XP!