Skip to content

Commit

Permalink
final fixes for keil/sdcc changes
Browse files Browse the repository at this point in the history
  • Loading branch information
idgay committed Apr 21, 2010
1 parent 7882f33 commit 47bd76d
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion nregress/exts/keil/run1
Original file line number Diff line number Diff line change
@@ -1 +1 @@
$NESC1 -fnesc-target=keil $1 >/dev/null
$NESC1 -fnesc-target=keil51 $1 >/dev/null
6 changes: 3 additions & 3 deletions src/nesc-network.c
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ static bool prt_network_lvalue(expression e)
else
{
prt_expression_helper(e, P_CALL);
output(".data");
output(".nxdata");
}

return isbf;
Expand Down Expand Up @@ -410,7 +410,7 @@ bool prt_network_typedef(data_decl d, variable_decl vd)
else
{
set_location(vd->location);
output("typedef struct { unsigned char data[%d]; } __attribute__((packed)) %s;",
output("typedef struct { unsigned char nxdata[%d]; } __attribute__((packed)) %s;",
(int)type_size_int(basetype), vd->ddecl->name);
}
return TRUE;
Expand Down Expand Up @@ -443,7 +443,7 @@ static bool prt_network_parameter_copy(declaration parm, bool copies,
else
{
output_hton(ddecl->type);
outputln("(%s.data, %s%s);", ddecl->name, NXBASE_PREFIX, ddecl->name);
outputln("(%s.nxdata, %s%s);", ddecl->name, NXBASE_PREFIX, ddecl->name);
}

return TRUE;
Expand Down
8 changes: 4 additions & 4 deletions tools/deputy_nodeputy.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,16 @@

#define __DEPUTY_UNUSED__ __attribute__((unused))

struct @nonnull @deputy_scope() { };
struct @nonnull @deputy_scope() { int dummy; };
struct @bnd @deputy_scope() { void *lo, *hi; };
struct @bnd_nok @deputy_scope() { void *lo, *hi; };
struct @count @deputy_scope() { int n; };
struct @count_nok @deputy_scope() { int n; };
struct @one @deputy_scope() { };
struct @one_nok @deputy_scope() { };
struct @one @deputy_scope() { int dummy; };
struct @one_nok @deputy_scope() { int dummy; };
struct @dmemset @deputy_scope() { int a1, a2, a3; };
struct @dmemcpy @deputy_scope() { int a1, a2, a3; };
struct @nts @deputy_scope() { };
struct @nts @deputy_scope() { int dummy; };

#define NONNULL @nonnull()
#define BND(x,y) @bnd(x,y)
Expand Down

0 comments on commit 47bd76d

Please sign in to comment.