From: Brian Norris Date: Fri, 12 Oct 2012 00:08:20 +0000 (-0700) Subject: move other interface headers to include/ X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=commitdiff_plain;h=55f3acdb4bec3b2879e189a82d23e112aba79aed move other interface headers to include/ We want all external interface headers (i.e., any #include'd in user programs) to be in the include/ directory. --- diff --git a/cmodelint.h b/cmodelint.h deleted file mode 100644 index 232648cd..00000000 --- a/cmodelint.h +++ /dev/null @@ -1,27 +0,0 @@ -/** @file cmodelint.h - * @brief C interface to the model checker. - */ - -#ifndef CMODELINT_H -#define CMODELINT_H -#include - -#if __cplusplus -using std::memory_order; -extern "C" { -#endif - -uint64_t model_read_action(void * obj, memory_order ord); -void model_write_action(void * obj, memory_order ord, uint64_t val); -void model_init_action(void * obj, uint64_t val); -uint64_t model_rmwr_action(void *obj, memory_order ord); -void model_rmw_action(void *obj, memory_order ord, uint64_t val); -void model_rmwc_action(void *obj, memory_order ord); -void model_fence_action(memory_order ord); - - -#if __cplusplus -} -#endif - -#endif diff --git a/include/cmodelint.h b/include/cmodelint.h new file mode 100644 index 00000000..232648cd --- /dev/null +++ b/include/cmodelint.h @@ -0,0 +1,27 @@ +/** @file cmodelint.h + * @brief C interface to the model checker. + */ + +#ifndef CMODELINT_H +#define CMODELINT_H +#include + +#if __cplusplus +using std::memory_order; +extern "C" { +#endif + +uint64_t model_read_action(void * obj, memory_order ord); +void model_write_action(void * obj, memory_order ord, uint64_t val); +void model_init_action(void * obj, uint64_t val); +uint64_t model_rmwr_action(void *obj, memory_order ord); +void model_rmw_action(void *obj, memory_order ord, uint64_t val); +void model_rmwc_action(void *obj, memory_order ord); +void model_fence_action(memory_order ord); + + +#if __cplusplus +} +#endif + +#endif diff --git a/include/librace.h b/include/librace.h new file mode 100644 index 00000000..591b2925 --- /dev/null +++ b/include/librace.h @@ -0,0 +1,28 @@ +/** @file librace.h + * @brief Interface to check normal memory operations for data races. + */ + +#ifndef __LIBRACE_H__ +#define __LIBRACE_H__ + +#include + +#ifdef __cplusplus +extern "C" { +#endif + + void store_8(void *addr, uint8_t val); + void store_16(void *addr, uint16_t val); + void store_32(void *addr, uint32_t val); + void store_64(void *addr, uint64_t val); + + uint8_t load_8(void *addr); + uint16_t load_16(void *addr); + uint32_t load_32(void *addr); + uint64_t load_64(void *addr); + +#ifdef __cplusplus +} +#endif + +#endif /* __LIBRACE_H__ */ diff --git a/librace.h b/librace.h deleted file mode 100644 index 591b2925..00000000 --- a/librace.h +++ /dev/null @@ -1,28 +0,0 @@ -/** @file librace.h - * @brief Interface to check normal memory operations for data races. - */ - -#ifndef __LIBRACE_H__ -#define __LIBRACE_H__ - -#include - -#ifdef __cplusplus -extern "C" { -#endif - - void store_8(void *addr, uint8_t val); - void store_16(void *addr, uint16_t val); - void store_32(void *addr, uint32_t val); - void store_64(void *addr, uint64_t val); - - uint8_t load_8(void *addr); - uint16_t load_16(void *addr); - uint32_t load_32(void *addr); - uint64_t load_64(void *addr); - -#ifdef __cplusplus -} -#endif - -#endif /* __LIBRACE_H__ */