Skip to content

include: Fix inline asm register constraints for clang #1062

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
beakthoven wants to merge 1 commit into
base: main
Choose a base branch
from
Open

include: Fix inline asm register constraints for clang #1062

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions include/avr/pgmspace.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1078,10 +1078,10 @@ extern const char * strchr_P(const char *, int __val) __ATTR_CONST__;
extern __ATTR_ALWAYS_INLINE__ __ATTR_GNU_INLINE__
const char * strchr_P(const char *__hay, int __val)
{
register const char *__r24 __asm("24") = __hay;
register int __r22 __asm("22") = __val;
register const char *__r24 __asm("r24") = __hay;
register int __r22 __asm("r22") = __val;
__asm ("%~call strchr_P"
: "+r" (__r24) : "r" (__r22) : "30", "31");
: "+r" (__r24) : "r" (__r22) : "r30", "r31");
return __r24;
}
#endif /* DOXYGEN */
Expand Down Expand Up @@ -1674,7 +1674,7 @@ extern int memcmp_PF(const void *, uint_farptr_t, size_t) __ATTR_PURE__;
extern __ATTR_ALWAYS_INLINE__ __ATTR_GNU_INLINE__
void* memcpy_P(void *__x, const void *__z, size_t __s)
{
register size_t __r20 __asm("20") = __s;
register size_t __r20 __asm("r20") = __s;
void *__ret = __x;
__asm volatile ("%~call __memcpy_P" : "+x" (__x), "+z" (__z), "+r" (__r20)
:: "0", "memory");
Expand All @@ -1691,10 +1691,10 @@ size_t strlen_P(const char *__s)
}
else
{
register const char *__r24 __asm("24") = __s;
register size_t __res __asm("24");
register const char *__r24 __asm("r24") = __s;
register size_t __res __asm("r24");
__asm ("%~call strlen_P" : "=r" (__res) : "r" (__r24)
: "0", "30", "31");
: "0", "r30", "r31");
return __res;
}
}
Expand All @@ -1721,7 +1721,7 @@ char* stpcpy_P(char *__x, const char *__z)
extern __ATTR_ALWAYS_INLINE__ __ATTR_GNU_INLINE__
int strcmp_P(const char *__x, const char *__z)
{
register int __ret __asm("24");
register int __ret __asm("r24");
__asm ("%~call __strcmp_P"
: "=r" (__ret), "+x" (__x), "+z" (__z) :: "memory");
return __ret;
Expand Down
14 changes: 7 additions & 7 deletions include/string.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,10 +264,10 @@ extern char *strchr(const char *, int) __ATTR_PURE__;
extern __ATTR_ALWAYS_INLINE__ __ATTR_GNU_INLINE__
char * strchr(const char *__hay, int __val)
{
register char *__r24 __asm("24");
register int __r22 __asm("22") = __val;
register char *__r24 __asm("r24");
register int __r22 __asm("r22") = __val;
__asm ("%~call strchr"
: "=r" (__r24) : "0" (__hay), "r" (__r22) : "30", "31");
: "=r" (__r24) : "0" (__hay), "r" (__r22) : "r30", "r31");
return __r24;
}
#endif /* DOXYGEN */
Expand Down Expand Up @@ -663,10 +663,10 @@ size_t strlen(const char *__s)
}
else
{
register const char *__r24 __asm("24") = __s;
register size_t __res __asm("24");
register const char *__r24 __asm("r24") = __s;
register size_t __res __asm("r24");
__asm ("%~call %x2" : "=r" (__res) : "r" (__r24), "i" (strlen)
: "30", "31", "memory");
: "r30", "r31", "memory");
return __res;
}
}
Expand All @@ -693,7 +693,7 @@ char* stpcpy(char *__x, const char *__z)
extern __ATTR_ALWAYS_INLINE__ __ATTR_GNU_INLINE__
int strcmp(const char *__x, const char *__z)
{
register int __ret __asm("24");
register int __ret __asm("r24");
__asm ("%~call __strcmp"
: "=r" (__ret), "+x" (__x), "+z" (__z) :: "memory");
return __ret;
Expand Down