1. A data processor comprising: a branch target buffer (BTB) including a plurality of BTB entries grouped in ways, wherein the BTB entries in one of the ways include a short tag address and the BTB entries in another one of the ways include a full tag address; and a page address buffer that includes entries for page address portions of a plurality of previously-received branch instructions in relation to the short tag address; wherein the entries in the BTB that include the short tag address further include a select field that is used to select one of the entries in a page address buffer.