Computer Architecture : A Quantitative ApproachThis is in really good shape - our class didn't use 1/10th of the book (though I read the whole thing.. 2 years ago and the topics are still relevant ...

Hennessy and Patterson had a good base to start from and this new edition is even better. It adds a CD-ROM with additional articles covering topics such as vector processors, interconnect networks ...