Skip to content

Commit

Permalink
Hexagon (tests/tcg/hexagon) fix inline asm in preg_alias.c
Browse files Browse the repository at this point in the history
Replace consecutive inline asm blocks with a single one with proper
outputs/inputs/clobbers rather than making assumptions about register
values being carried between separate blocks.

Signed-off-by: Taylor Simpson <tsimpson@quicinc.com>
Message-Id: <20220210021556.9217-10-tsimpson@quicinc.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
  • Loading branch information
taylorsimpson committed Mar 12, 2022
1 parent 8576e7e commit 8af2d99
Showing 1 changed file with 22 additions and 24 deletions.
46 changes: 22 additions & 24 deletions tests/tcg/hexagon/preg_alias.c
@@ -1,5 +1,5 @@
/*
* Copyright(c) 2019-2021 Qualcomm Innovation Center, Inc. All Rights Reserved.
* Copyright(c) 2019-2022 Qualcomm Innovation Center, Inc. All Rights Reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down Expand Up @@ -57,17 +57,15 @@ typedef union {

static inline void creg_alias(int cval, PRegs *pregs)
{
unsigned char val;
asm volatile("c4 = %0" : : "r"(cval));

asm volatile("%0 = p0" : "=r"(val));
pregs->pregs.p0 = val;
asm volatile("%0 = p1" : "=r"(val));
pregs->pregs.p1 = val;
asm volatile("%0 = p2" : "=r"(val));
pregs->pregs.p2 = val;
asm volatile("%0 = p3" : "=r"(val));
pregs->pregs.p3 = val;
asm("c4 = %4\n\t"
"%0 = p0\n\t"
"%1 = p1\n\t"
"%2 = p2\n\t"
"%3 = p3\n\t"
: "=r"(pregs->pregs.p0), "=r"(pregs->pregs.p1),
"=r"(pregs->pregs.p2), "=r"(pregs->pregs.p3)
: "r"(cval)
: "p0", "p1", "p2", "p3");
}

int err;
Expand All @@ -83,19 +81,19 @@ static void check(int val, int expect)
static inline void creg_alias_pair(unsigned int cval, PRegs *pregs)
{
unsigned long long cval_pair = (0xdeadbeefULL << 32) | cval;
unsigned char val;
int c5;
asm volatile("c5:4 = %0" : : "r"(cval_pair));

asm volatile("%0 = p0" : "=r"(val));
pregs->pregs.p0 = val;
asm volatile("%0 = p1" : "=r"(val));
pregs->pregs.p1 = val;
asm volatile("%0 = p2" : "=r"(val));
pregs->pregs.p2 = val;
asm volatile("%0 = p3" : "=r"(val));
pregs->pregs.p3 = val;
asm volatile("%0 = c5" : "=r"(c5));

asm ("c5:4 = %5\n\t"
"%0 = p0\n\t"
"%1 = p1\n\t"
"%2 = p2\n\t"
"%3 = p3\n\t"
"%4 = c5\n\t"
: "=r"(pregs->pregs.p0), "=r"(pregs->pregs.p1),
"=r"(pregs->pregs.p2), "=r"(pregs->pregs.p3), "=r"(c5)
: "r"(cval_pair)
: "p0", "p1", "p2", "p3");

check(c5, 0xdeadbeef);
}

Expand Down

0 comments on commit 8af2d99

Please sign in to comment.