commit 709b2160bcd8f6f57c8754c73d40550895339c7b Author: Jeff Law Date: Sun Oct 16 10:58:52 2022 -0400 Rename "z" constraint to "Zz" on the H8/300 I want to use Z as a multi-letter constraint. So first we have to adjust the existing use of Z. This does not affect code generation. gcc/ * config/h8300/constraints.md (Zz constraint): Renamed from "z". * config/h8300/movepush.md (movqi_h8sx, movhi_h8sx): Adjust constraint to use Zz instead of Z. diff --git a/gcc/config/h8300/constraints.md b/gcc/config/h8300/constraints.md index 2836232d882..f71996c5f38 100644 --- a/gcc/config/h8300/constraints.md +++ b/gcc/config/h8300/constraints.md @@ -211,7 +211,7 @@ (and (match_code "const_int") (match_test "exact_log2 (ival & 0xff) != -1"))) -(define_constraint "Z" +(define_constraint "Zz" "@internal" (and (match_test "TARGET_H8300SX") (match_code "mem") diff --git a/gcc/config/h8300/movepush.md b/gcc/config/h8300/movepush.md index ada4ddd0beb..e895de8ce59 100644 --- a/gcc/config/h8300/movepush.md +++ b/gcc/config/h8300/movepush.md @@ -28,7 +28,7 @@ [(set (attr "length") (symbol_ref "compute_mov_length (operands)"))]) (define_insn_and_split "*movqi_h8sx" - [(set (match_operand:QI 0 "general_operand_dst" "=Z,rQ") + [(set (match_operand:QI 0 "general_operand_dst" "=Zz,rQ") (match_operand:QI 1 "general_operand_src" "P4>X,rQi"))] "TARGET_H8300SX" "#" @@ -37,7 +37,7 @@ (clobber (reg:CC CC_REG))])]) (define_insn "*movqi_h8sx" - [(set (match_operand:QI 0 "general_operand_dst" "=Z,rQ") + [(set (match_operand:QI 0 "general_operand_dst" "=Zz,rQ") (match_operand:QI 1 "general_operand_src" "P4>X,rQi")) (clobber (reg:CC CC_REG))] "TARGET_H8300SX" @@ -113,7 +113,7 @@ [(set (attr "length") (symbol_ref "compute_mov_length (operands)"))]) (define_insn_and_split "*movhi_h8sx" - [(set (match_operand:HI 0 "general_operand_dst" "=r,r,Z,Q,rQ") + [(set (match_operand:HI 0 "general_operand_dst" "=r,r,Zz,Q,rQ") (match_operand:HI 1 "general_operand_src" "I,P3>X,P4>X,IP8>X,rQi"))] "TARGET_H8300SX" "#" @@ -122,7 +122,7 @@ (clobber (reg:CC CC_REG))])]) (define_insn "*movhi_h8sx" - [(set (match_operand:HI 0 "general_operand_dst" "=r,r,Z,Q,rQ") + [(set (match_operand:HI 0 "general_operand_dst" "=r,r,Zz,Q,rQ") (match_operand:HI 1 "general_operand_src" "I,P3>X,P4>X,IP8>X,rQi")) (clobber (reg:CC CC_REG))] "TARGET_H8300SX"