cdriso: merge from pcsxr r90558