Skip to content

Commit 47111d3

Browse files
dtarditidtarditi
committed
2 parents 568bff6 + 11943ff commit 47111d3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+195
-194
lines changed

‎MultiSource/Benchmarks/Olden/bh/args.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* For copyright information, see olden_v1.0/COPYRIGHT */
22
#include <stdlib_checked.h>
33

4-
#pragma BOUNDS_CHECKED ON
4+
#pragma CHECKED_SCOPE ON
55

66
extern int NumNodes;
77
extern int nbody;

‎MultiSource/Benchmarks/Olden/bh/code.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* It's free because it's yours.
77
*/
88

9-
#pragma BOUNDS_CHECKED ON
9+
#pragma CHECKED_SCOPE ON
1010

1111
/* Former global variables. convert to #defines */
1212

@@ -21,7 +21,7 @@
2121

2222
extern int nbody;
2323

24-
#pragma BOUNDS_CHECKED OFF
24+
#pragma CHECKED_SCOPE OFF
2525

2626

2727

‎MultiSource/Benchmarks/Olden/bh/defs.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ int NumNodes;
2626
#define THREEDIM
2727
#include "vectmath.h"
2828

29-
#pragma BOUNDS_CHECKED ON
29+
#pragma CHECKED_SCOPE ON
3030

3131
#define MAX_NUM_NODES 64
3232
extern double fabs(double);
@@ -250,5 +250,5 @@ extern int nbody;
250250

251251

252252

253-
#pragma BOUNDS_CHECKED OFF
253+
#pragma CHECKED_SCOPE OFF
254254

‎MultiSource/Benchmarks/Olden/bh/newbh.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#include "defs.h"
1313
#include "code.h"
1414

15-
#pragma BOUNDS_CHECKED ON
15+
#pragma CHECKED_SCOPE ON
1616

1717
int nbody;
1818

@@ -77,12 +77,12 @@ treeptr old_main(void) {
7777
bodyptr prev=NULL;
7878
int tmp=0, range=((1<<NDIM) << NDIM) / NumNodes;
7979
int bodiesper _Checked[MAX_NUM_NODES];
80-
bodyptr ptrper _Checked[MAX_NUM_NODES] = { 0 };
80+
bodyptr ptrper _Checked[MAX_NUM_NODES] = {0};
8181

8282
srand(123);/* set random generator */
8383

8484
/* Tree data structure is global, points to root, and bodylist, has size info */
85-
t = (treeptr)malloc(sizeof(tree));
85+
t = malloc<tree>(sizeof(tree));
8686
Root(t) = NULL;
8787
t->rmin[0] = -2.0;
8888
t->rmin[1] = -2.0;
@@ -364,7 +364,7 @@ void my_free(nodeptr n)
364364
bodyptr ubody_alloc(int p)
365365
{ register bodyptr tmp = NULL;
366366

367-
tmp = (bodyptr)malloc(sizeof(body));
367+
tmp = malloc<body>(sizeof(body));
368368

369369
Type(tmp) = BODY;
370370
Proc(tmp) = p;
@@ -385,7 +385,7 @@ cellptr cell_alloc(int p)
385385
}
386386
else
387387
{
388-
tmp = (cellptr)malloc(sizeof(cell));
388+
tmp = malloc<cell>(sizeof(cell));
389389
}
390390
Type(tmp) = CELL;
391391
Proc(tmp) = p;
@@ -652,7 +652,7 @@ void gravstep(real rsize, nodeptr rt, bodyptr p, int nstep, real dthf)
652652

653653
void hackgrav(bodyptr p, real rsize, nodeptr rt)
654654
{
655-
hgstruct hg = { 0 };
655+
hgstruct hg = {0};
656656
real szsq;
657657

658658
NOTEST();

‎MultiSource/Benchmarks/Olden/bh/stdinc.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
#include <math_checked.h>
2222
#include <stdlib_checked.h>
2323

24-
#pragma BOUNDS_CHECKED ON
24+
#pragma CHECKED_SCOPE ON
2525

2626
/*
2727
* STREAM: a replacement for FILE *.
@@ -125,4 +125,4 @@ typedef _Ptr<real()> rproc;
125125
#define MAX(x,y) (((x) > (y)) ? (x) : (y))
126126
#define MIN(x,y) (((x) < (y)) ? (x) : (y))
127127

128-
#pragma BOUNDS_CHECKED OFF
128+
#pragma CHECKED_SCOPE OFF

‎MultiSource/Benchmarks/Olden/bh/util.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#include "stdinc.h"
1010
#include <errno.h>
1111

12-
#pragma BOUNDS_CHECKED ON
12+
#pragma CHECKED_SCOPE ON
1313

1414
#define A16807.0
1515
#define M2147483647.0

‎MultiSource/Benchmarks/Olden/bh/vectmath.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* It's free because it's yours.
77
*/
88

9-
#pragma BOUNDS_CHECKED ON
9+
#pragma CHECKED_SCOPE ON
1010

1111
#ifndef THREEDIM
1212
# ifndef TWODIM
@@ -294,7 +294,7 @@ extern double sqrt(double x);
294294

295295

296296

297-
#pragma BOUNDS_CHECKED OFF
297+
#pragma CHECKED_SCOPE OFF
298298

299299

300300

‎MultiSource/Benchmarks/Olden/bh/walksub.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#define global
22
#include "defs.h"
33

4-
#pragma BOUNDS_CHECKED ON
4+
#pragma CHECKED_SCOPE ON
55

66
typedef struct {
77
bodyptr pskip;/* body to skip in force evaluation */
@@ -24,7 +24,7 @@ hgstruct walksub(nodeptr p, real dsq, real tolsq, hgstruct hg, int level)
2424
{
2525
register int k, i;
2626
register nodeptr r = NULL;
27-
nodeptr tmp _Checked[NSUB] = { 0 };
27+
nodeptr tmp _Checked[NSUB] = {0};
2828

2929

3030
if (subdivp(p, dsq, tolsq, hg)) { /* should p be opened? */

‎MultiSource/Benchmarks/Olden/bisort/args.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#include <stdchecked.h>
33
#include <stdlib_checked.h>
44

5-
#pragma BOUNDS_CHECKED ON
5+
#pragma CHECKED_SCOPE ON
66

77
extern int NumNodes,NDim;
88
extern int flag;

‎MultiSource/Benchmarks/Olden/bisort/bitonic.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#include "proc.h" /* Procedure Types/Nums */
77
#include <stdio_checked.h>
88

9-
#pragma BOUNDS_CHECKED ON
9+
#pragma CHECKED_SCOPE ON
1010

1111
#define printf(...) _Unchecked { printf(__VA_ARGS__); }
1212

@@ -64,7 +64,7 @@ int random(int seed) {
6464

6565
ptr<HANDLE> RandTree(int n, int seed, int node, int level) {
6666
int next_val,my_name;
67-
future_cell_int f_left = { 0 }, f_right = { 0 };
67+
future_cell_int f_left = { 0 }, f_right = {0};
6868
ptr<HANDLE> h = NIL;
6969
my_name=foo++;
7070
if (n > 1) {

0 commit comments

Comments
 (0)