OrgApache/incubator-nuttx
OrgApache
/
incubator-nuttx
mirror of https://github.com/apache/incubator-nuttx.git
1
0
Fork 0
Code Issues Releases Wiki Activity

arch:riscv: remove arch atomic, use libc atomic when need 

It is more common for implement in libc/machine

Change-Id: I3da6c3db64adb78c05ddb26d3956817ac6ada93e
This commit is contained in:
zhuyanlin 2021-08-26 17:20:23 +08:00 committed by Gustavo Henrique Nihei
parent 3da0bb7829
commit cd18d1f050
3 changed files with 1 additions and 287 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/risc-v/Kconfig
View File

@ -45,6 +45,7 @@ config ARCH_CHIP_ESP32C3
select RV32IM_HW_MULDIV
select ARCH_VECNOTIRQ
select ARCH_HAVE_RESET
select LIBC_ARCH_ATOMIC
select LIBC_ARCH_MEMCHR
select LIBC_ARCH_MEMCMP
select LIBC_ARCH_MEMCCMP

4
arch/risc-v/src/esp32c3/Make.defs
View File

@ -123,10 +123,6 @@ ifeq ($(CONFIG_ESP32C3_FREERUN),y)
CHIP_CSRCS += esp32c3_freerun.c
endif
ifeq ($(CONFIG_ESP32C3_DISABLE_STDC_ATOMIC),)
CHIP_CSRCS += esp32c3_std_atomic.c
endif
ifeq ($(CONFIG_ESP32C3_DMA),y)
CHIP_CSRCS += esp32c3_dma.c
endif

283
arch/risc-v/src/esp32c3/esp32c3_std_atomic.c
View File

@ -1,283 +0,0 @@
/****************************************************************************
* arch/risc-v/src/esp32c3/esp32c3_std_atomic.c
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership. The
* ASF licenses this file to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the
* License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
* License for the specific language governing permissions and limitations
* under the License.
*
****************************************************************************/
/****************************************************************************
* Included Files
****************************************************************************/
#include <nuttx/config.h>
#include <stdbool.h>
#include <stdint.h>
#include <nuttx/spinlock.h>
/****************************************************************************
* Pre-processor Definitions
****************************************************************************/
#define CMP_EXCHANGE(n, type) \
\
bool __atomic_compare_exchange_ ## n (type *mem, \
type *expect, \
type desired, \
int success, \
int failure) \
{ \
bool ret = false; \
irqstate_t irqstate = spin_lock_irqsave(NULL); \
\
if (*mem == *expect) \
{ \
ret = true; \
*mem = desired; \
} \
else \
{ \
*expect = *mem; \
} \
\
spin_unlock_irqrestore(NULL, irqstate); \
return ret; \
}
#define FETCH_ADD(n, type) \
\
type __atomic_fetch_add_ ## n (type *ptr, \
type value, \
int memorder) \
{ \
irqstate_t irqstate = spin_lock_irqsave(NULL); \
type ret = *ptr; \
\
*ptr = *ptr + value; \
\
spin_unlock_irqrestore(NULL, irqstate); \
return ret; \
}
#define FETCH_SUB(n, type) \
\
type __atomic_fetch_sub_ ## n (type *ptr, \
type value, \
int memorder) \
{ \
irqstate_t irqstate = spin_lock_irqsave(NULL); \
type ret = *ptr; \
\
*ptr = *ptr - value; \
\
spin_unlock_irqrestore(NULL, irqstate); \
return ret; \
}
#define FETCH_AND(n, type) \
\
type __atomic_fetch_and_ ## n (type *ptr, \
type value, \
int memorder) \
{ \
irqstate_t irqstate = spin_lock_irqsave(NULL); \
type ret = *ptr; \
\
*ptr = *ptr & value; \
\
spin_unlock_irqrestore(NULL, irqstate); \
return ret; \
}
#define FETCH_OR(n, type) \
\
type __atomic_fetch_or_ ## n (type *ptr, \
type value, \
int memorder) \
{ \
irqstate_t irqstate = spin_lock_irqsave(NULL); \
type ret = *ptr; \
\
*ptr = *ptr | value; \
\
spin_unlock_irqrestore(NULL, irqstate); \
return ret; \
}
#define FETCH_XOR(n, type) \
\
type __atomic_fetch_xor_ ## n (type *ptr, \
type value, \
int memorder) \
{ \
irqstate_t irqstate = spin_lock_irqsave(NULL); \
type ret = *ptr; \
\
*ptr = *ptr ^ value; \
\
spin_unlock_irqrestore(NULL, irqstate); \
return ret; \
}
#pragma GCC diagnostic ignored "-Wbuiltin-declaration-mismatch"
/****************************************************************************
* Public Functions
****************************************************************************/
/****************************************************************************
* Name: __atomic_compare_exchange_1
****************************************************************************/
CMP_EXCHANGE(1, uint8_t)
/****************************************************************************
* Name: __atomic_compare_exchange_2
****************************************************************************/
CMP_EXCHANGE(2, uint16_t)
/****************************************************************************
* Name: __atomic_compare_exchange_4
****************************************************************************/
CMP_EXCHANGE(4, uint32_t)
/****************************************************************************
* Name: __atomic_compare_exchange_8
****************************************************************************/
CMP_EXCHANGE(8, uint64_t)
/****************************************************************************
* Name: __atomic_fetch_add_1
****************************************************************************/
FETCH_ADD(1, uint8_t)
/****************************************************************************
* Name: __atomic_fetch_add_2
****************************************************************************/
FETCH_ADD(2, uint16_t)
/****************************************************************************
* Name: __atomic_fetch_add_4
****************************************************************************/
FETCH_ADD(4, uint32_t)
/****************************************************************************
* Name: __atomic_fetch_add_8
****************************************************************************/
FETCH_ADD(8, uint64_t)
/****************************************************************************
* Name: __atomic_fetch_sub_1
****************************************************************************/
FETCH_SUB(1, uint8_t)
/****************************************************************************
* Name: __atomic_fetch_sub_2
****************************************************************************/
FETCH_SUB(2, uint16_t)
/****************************************************************************
* Name: __atomic_fetch_sub_4
****************************************************************************/
FETCH_SUB(4, uint32_t)
/****************************************************************************
* Name: __atomic_fetch_sub_8
****************************************************************************/
FETCH_SUB(8, uint64_t)
/****************************************************************************
* Name: __atomic_fetch_and_1
****************************************************************************/
FETCH_AND(1, uint8_t)
/****************************************************************************
* Name: __atomic_fetch_and_2
****************************************************************************/
FETCH_AND(2, uint16_t)
/****************************************************************************
* Name: __atomic_fetch_and_4
****************************************************************************/
FETCH_AND(4, uint32_t)
/****************************************************************************
* Name: __atomic_fetch_and_8
****************************************************************************/
FETCH_AND(8, uint64_t)
/****************************************************************************
* Name: __atomic_fetch_or_1
****************************************************************************/
FETCH_OR(1, uint8_t)
/****************************************************************************
* Name: __atomic_fetch_or_2
****************************************************************************/
FETCH_OR(2, uint16_t)
/****************************************************************************
* Name: __atomic_fetch_or_4
****************************************************************************/
FETCH_OR(4, uint32_t)
/****************************************************************************
* Name: __atomic_fetch_or_4
****************************************************************************/
FETCH_OR(8, uint64_t)
/****************************************************************************
* Name: __atomic_fetch_xor_1
****************************************************************************/
FETCH_XOR(1, uint8_t)
/****************************************************************************
* Name: __atomic_fetch_xor_2
****************************************************************************/
FETCH_XOR(2, uint16_t)
/****************************************************************************
* Name: __atomic_fetch_xor_4
****************************************************************************/
FETCH_XOR(4, uint32_t)
/****************************************************************************
* Name: __atomic_fetch_xor_8
****************************************************************************/
FETCH_XOR(8, uint64_t)