@@ -518,12 +518,18 @@ s390_value_from_register (struct gdbarch *gdbarch, struct type *type,
int regnum, struct frame_id frame_id)
{
struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
- struct value *value = default_value_from_register (gdbarch, type,
- regnum, frame_id);
- check_typedef (type);
+ unsigned int len = TYPE_LENGTH (check_typedef (type));
+ struct value *value;
- if ((regnum >= S390_F0_REGNUM && regnum <= S390_F15_REGNUM
- && TYPE_LENGTH (type) < 8)
+ /* If the value fits in a sub-register, use that instead. */
+ if (regnum_is_vxr_full (tdep, regnum) && len <= 8)
+ regnum = regnum - tdep->v0_full_regnum + S390_F0_REGNUM;
+ else if (regnum_is_gpr_full (tdep, regnum) && len <= 4)
+ regnum = regnum - tdep->gpr_full_regnum + S390_R0_REGNUM;
+
+ value = default_value_from_register (gdbarch, type, regnum, frame_id);
+
+ if ((regnum >= S390_F0_REGNUM && regnum <= S390_F15_REGNUM && len < 8)
|| regnum_is_vxr_full (tdep, regnum)
|| (regnum >= S390_V16_REGNUM && regnum <= S390_V31_REGNUM))
set_value_offset (value, 0);