author | Edouard Tisserant |
Fri, 23 Jul 2021 13:15:19 +0200 | |
branch | svghmi |
changeset 3288 | 8f3cb4b47cbb |
parent 2710 | aaa1dc426213 |
child 3394 | 9ea29ac18837 |
permissions | -rw-r--r-- |
209
08dc3d064cb5
Moved template C code to targets dir. Cleaned up some forgotten print.
etisserant
parents:
diff
changeset
|
1 |
/* |
08dc3d064cb5
Moved template C code to targets dir. Cleaned up some forgotten print.
etisserant
parents:
diff
changeset
|
2 |
* DEBUGGER code |
08dc3d064cb5
Moved template C code to targets dir. Cleaned up some forgotten print.
etisserant
parents:
diff
changeset
|
3 |
* |
08dc3d064cb5
Moved template C code to targets dir. Cleaned up some forgotten print.
etisserant
parents:
diff
changeset
|
4 |
* On "publish", when buffer is free, debugger stores arbitrary variables |
08dc3d064cb5
Moved template C code to targets dir. Cleaned up some forgotten print.
etisserant
parents:
diff
changeset
|
5 |
* content into, and mark this buffer as filled |
08dc3d064cb5
Moved template C code to targets dir. Cleaned up some forgotten print.
etisserant
parents:
diff
changeset
|
6 |
* |
08dc3d064cb5
Moved template C code to targets dir. Cleaned up some forgotten print.
etisserant
parents:
diff
changeset
|
7 |
* |
08dc3d064cb5
Moved template C code to targets dir. Cleaned up some forgotten print.
etisserant
parents:
diff
changeset
|
8 |
* Buffer content is read asynchronously, (from non real time part), |
08dc3d064cb5
Moved template C code to targets dir. Cleaned up some forgotten print.
etisserant
parents:
diff
changeset
|
9 |
* and then buffer marked free again. |
08dc3d064cb5
Moved template C code to targets dir. Cleaned up some forgotten print.
etisserant
parents:
diff
changeset
|
10 |
* |
08dc3d064cb5
Moved template C code to targets dir. Cleaned up some forgotten print.
etisserant
parents:
diff
changeset
|
11 |
* |
08dc3d064cb5
Moved template C code to targets dir. Cleaned up some forgotten print.
etisserant
parents:
diff
changeset
|
12 |
* */ |
2501
eba2bbb2dd9a
Make online debug optional
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
2190
diff
changeset
|
13 |
#ifdef TARGET_DEBUG_AND_RETAIN_DISABLE |
1800
1711339585ce
make possible to turn off at compile time online debugging, logging
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1677
diff
changeset
|
14 |
|
1711339585ce
make possible to turn off at compile time online debugging, logging
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1677
diff
changeset
|
15 |
void __init_debug (void){} |
1711339585ce
make possible to turn off at compile time online debugging, logging
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1677
diff
changeset
|
16 |
void __cleanup_debug (void){} |
1711339585ce
make possible to turn off at compile time online debugging, logging
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1677
diff
changeset
|
17 |
void __retrieve_debug(void){} |
1711339585ce
make possible to turn off at compile time online debugging, logging
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1677
diff
changeset
|
18 |
void __publish_debug (void){} |
1711339585ce
make possible to turn off at compile time online debugging, logging
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1677
diff
changeset
|
19 |
|
1711339585ce
make possible to turn off at compile time online debugging, logging
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1677
diff
changeset
|
20 |
#else |
1711339585ce
make possible to turn off at compile time online debugging, logging
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1677
diff
changeset
|
21 |
|
209
08dc3d064cb5
Moved template C code to targets dir. Cleaned up some forgotten print.
etisserant
parents:
diff
changeset
|
22 |
#include "iec_types_all.h" |
08dc3d064cb5
Moved template C code to targets dir. Cleaned up some forgotten print.
etisserant
parents:
diff
changeset
|
23 |
#include "POUS.h" |
08dc3d064cb5
Moved template C code to targets dir. Cleaned up some forgotten print.
etisserant
parents:
diff
changeset
|
24 |
/*for memcpy*/ |
08dc3d064cb5
Moved template C code to targets dir. Cleaned up some forgotten print.
etisserant
parents:
diff
changeset
|
25 |
#include <string.h> |
335
c5f3f71e7260
fixed bug : buffer overflow when debugging PLC with python blocks
greg
parents:
280
diff
changeset
|
26 |
#include <stdio.h> |
209
08dc3d064cb5
Moved template C code to targets dir. Cleaned up some forgotten print.
etisserant
parents:
diff
changeset
|
27 |
|
2501
eba2bbb2dd9a
Make online debug optional
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
2190
diff
changeset
|
28 |
#ifndef TARGET_ONLINE_DEBUG_DISABLE |
335
c5f3f71e7260
fixed bug : buffer overflow when debugging PLC with python blocks
greg
parents:
280
diff
changeset
|
29 |
#define BUFFER_SIZE %(buffer_size)d |
209
08dc3d064cb5
Moved template C code to targets dir. Cleaned up some forgotten print.
etisserant
parents:
diff
changeset
|
30 |
|
08dc3d064cb5
Moved template C code to targets dir. Cleaned up some forgotten print.
etisserant
parents:
diff
changeset
|
31 |
/* Atomically accessed variable for buffer state */ |
08dc3d064cb5
Moved template C code to targets dir. Cleaned up some forgotten print.
etisserant
parents:
diff
changeset
|
32 |
#define BUFFER_FREE 0 |
08dc3d064cb5
Moved template C code to targets dir. Cleaned up some forgotten print.
etisserant
parents:
diff
changeset
|
33 |
#define BUFFER_BUSY 1 |
08dc3d064cb5
Moved template C code to targets dir. Cleaned up some forgotten print.
etisserant
parents:
diff
changeset
|
34 |
static long buffer_state = BUFFER_FREE; |
08dc3d064cb5
Moved template C code to targets dir. Cleaned up some forgotten print.
etisserant
parents:
diff
changeset
|
35 |
|
08dc3d064cb5
Moved template C code to targets dir. Cleaned up some forgotten print.
etisserant
parents:
diff
changeset
|
36 |
/* The buffer itself */ |
08dc3d064cb5
Moved template C code to targets dir. Cleaned up some forgotten print.
etisserant
parents:
diff
changeset
|
37 |
char debug_buffer[BUFFER_SIZE]; |
08dc3d064cb5
Moved template C code to targets dir. Cleaned up some forgotten print.
etisserant
parents:
diff
changeset
|
38 |
|
08dc3d064cb5
Moved template C code to targets dir. Cleaned up some forgotten print.
etisserant
parents:
diff
changeset
|
39 |
/* Buffer's cursor*/ |
08dc3d064cb5
Moved template C code to targets dir. Cleaned up some forgotten print.
etisserant
parents:
diff
changeset
|
40 |
static char* buffer_cursor = debug_buffer; |
2501
eba2bbb2dd9a
Make online debug optional
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
2190
diff
changeset
|
41 |
#endif |
eba2bbb2dd9a
Make online debug optional
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
2190
diff
changeset
|
42 |
|
483
bc26c42d2eec
fixed greg's crap in win32, enhanced debug stability, implemented preliminary retain
edouard
parents:
477
diff
changeset
|
43 |
static unsigned int retain_offset = 0; |
209
08dc3d064cb5
Moved template C code to targets dir. Cleaned up some forgotten print.
etisserant
parents:
diff
changeset
|
44 |
/*** |
08dc3d064cb5
Moved template C code to targets dir. Cleaned up some forgotten print.
etisserant
parents:
diff
changeset
|
45 |
* Declare programs |
08dc3d064cb5
Moved template C code to targets dir. Cleaned up some forgotten print.
etisserant
parents:
diff
changeset
|
46 |
**/ |
08dc3d064cb5
Moved template C code to targets dir. Cleaned up some forgotten print.
etisserant
parents:
diff
changeset
|
47 |
%(programs_declarations)s |
08dc3d064cb5
Moved template C code to targets dir. Cleaned up some forgotten print.
etisserant
parents:
diff
changeset
|
48 |
|
08dc3d064cb5
Moved template C code to targets dir. Cleaned up some forgotten print.
etisserant
parents:
diff
changeset
|
49 |
/*** |
08dc3d064cb5
Moved template C code to targets dir. Cleaned up some forgotten print.
etisserant
parents:
diff
changeset
|
50 |
* Declare global variables from resources and conf |
08dc3d064cb5
Moved template C code to targets dir. Cleaned up some forgotten print.
etisserant
parents:
diff
changeset
|
51 |
**/ |
08dc3d064cb5
Moved template C code to targets dir. Cleaned up some forgotten print.
etisserant
parents:
diff
changeset
|
52 |
%(extern_variables_declarations)s |
08dc3d064cb5
Moved template C code to targets dir. Cleaned up some forgotten print.
etisserant
parents:
diff
changeset
|
53 |
|
1432
8872223a675b
Optimized plc_debug.c generated code. Should produce smaller code size. Added statically initialized array for PLC tracable variable description.
Edouard Tisserant
parents:
1403
diff
changeset
|
54 |
typedef const struct { |
8872223a675b
Optimized plc_debug.c generated code. Should produce smaller code size. Added statically initialized array for PLC tracable variable description.
Edouard Tisserant
parents:
1403
diff
changeset
|
55 |
void *ptr; |
8872223a675b
Optimized plc_debug.c generated code. Should produce smaller code size. Added statically initialized array for PLC tracable variable description.
Edouard Tisserant
parents:
1403
diff
changeset
|
56 |
__IEC_types_enum type; |
8872223a675b
Optimized plc_debug.c generated code. Should produce smaller code size. Added statically initialized array for PLC tracable variable description.
Edouard Tisserant
parents:
1403
diff
changeset
|
57 |
} dbgvardsc_t; |
8872223a675b
Optimized plc_debug.c generated code. Should produce smaller code size. Added statically initialized array for PLC tracable variable description.
Edouard Tisserant
parents:
1403
diff
changeset
|
58 |
|
8872223a675b
Optimized plc_debug.c generated code. Should produce smaller code size. Added statically initialized array for PLC tracable variable description.
Edouard Tisserant
parents:
1403
diff
changeset
|
59 |
static dbgvardsc_t dbgvardsc[] = { |
8872223a675b
Optimized plc_debug.c generated code. Should produce smaller code size. Added statically initialized array for PLC tracable variable description.
Edouard Tisserant
parents:
1403
diff
changeset
|
60 |
%(variable_decl_array)s |
8872223a675b
Optimized plc_debug.c generated code. Should produce smaller code size. Added statically initialized array for PLC tracable variable description.
Edouard Tisserant
parents:
1403
diff
changeset
|
61 |
}; |
8872223a675b
Optimized plc_debug.c generated code. Should produce smaller code size. Added statically initialized array for PLC tracable variable description.
Edouard Tisserant
parents:
1403
diff
changeset
|
62 |
|
8872223a675b
Optimized plc_debug.c generated code. Should produce smaller code size. Added statically initialized array for PLC tracable variable description.
Edouard Tisserant
parents:
1403
diff
changeset
|
63 |
typedef void(*__for_each_variable_do_fp)(dbgvardsc_t*); |
452
2d0718a05cc7
Reflect changes in iec type definitions in matiec/lib
edouard
parents:
450
diff
changeset
|
64 |
void __for_each_variable_do(__for_each_variable_do_fp fp) |
450
18583d13f0fa
Preliminary accessor support for debug
Edouard TISSERANT <edouard.tisserant@gmail.com>
parents:
423
diff
changeset
|
65 |
{ |
2190
b7d803fc44db
Fix compilation warning/error: comparison between signed and unsigned integer expressions [-Werror=sign-compare]
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
2172
diff
changeset
|
66 |
unsigned int i; |
1432
8872223a675b
Optimized plc_debug.c generated code. Should produce smaller code size. Added statically initialized array for PLC tracable variable description.
Edouard Tisserant
parents:
1403
diff
changeset
|
67 |
for(i = 0; i < sizeof(dbgvardsc)/sizeof(dbgvardsc_t); i++){ |
8872223a675b
Optimized plc_debug.c generated code. Should produce smaller code size. Added statically initialized array for PLC tracable variable description.
Edouard Tisserant
parents:
1403
diff
changeset
|
68 |
dbgvardsc_t *dsc = &dbgvardsc[i]; |
8872223a675b
Optimized plc_debug.c generated code. Should produce smaller code size. Added statically initialized array for PLC tracable variable description.
Edouard Tisserant
parents:
1403
diff
changeset
|
69 |
if(dsc->type != UNKNOWN_ENUM) |
8872223a675b
Optimized plc_debug.c generated code. Should produce smaller code size. Added statically initialized array for PLC tracable variable description.
Edouard Tisserant
parents:
1403
diff
changeset
|
70 |
(*fp)(dsc); |
452
2d0718a05cc7
Reflect changes in iec type definitions in matiec/lib
edouard
parents:
450
diff
changeset
|
71 |
} |
450
18583d13f0fa
Preliminary accessor support for debug
Edouard TISSERANT <edouard.tisserant@gmail.com>
parents:
423
diff
changeset
|
72 |
} |
209
08dc3d064cb5
Moved template C code to targets dir. Cleaned up some forgotten print.
etisserant
parents:
diff
changeset
|
73 |
|
2632
534387caf43d
variable access code moved from plc_debug.c to targets/var_access.c for easiewr re-use in ext.
Edouard Tisserant
parents:
2501
diff
changeset
|
74 |
#define __Unpack_desc_type dbgvardsc_t |
534387caf43d
variable access code moved from plc_debug.c to targets/var_access.c for easiewr re-use in ext.
Edouard Tisserant
parents:
2501
diff
changeset
|
75 |
|
534387caf43d
variable access code moved from plc_debug.c to targets/var_access.c for easiewr re-use in ext.
Edouard Tisserant
parents:
2501
diff
changeset
|
76 |
%(var_access_code)s |
483
bc26c42d2eec
fixed greg's crap in win32, enhanced debug stability, implemented preliminary retain
edouard
parents:
477
diff
changeset
|
77 |
|
bc26c42d2eec
fixed greg's crap in win32, enhanced debug stability, implemented preliminary retain
edouard
parents:
477
diff
changeset
|
78 |
void Remind(unsigned int offset, unsigned int count, void * p); |
bc26c42d2eec
fixed greg's crap in win32, enhanced debug stability, implemented preliminary retain
edouard
parents:
477
diff
changeset
|
79 |
|
1432
8872223a675b
Optimized plc_debug.c generated code. Should produce smaller code size. Added statically initialized array for PLC tracable variable description.
Edouard Tisserant
parents:
1403
diff
changeset
|
80 |
void RemindIterator(dbgvardsc_t *dsc) |
483
bc26c42d2eec
fixed greg's crap in win32, enhanced debug stability, implemented preliminary retain
edouard
parents:
477
diff
changeset
|
81 |
{ |
605
2250ed42e306
debugger : forcing %M and %Q variables on each cycle, and rework of code for optimization and concision
Edouard Tisserant
parents:
582
diff
changeset
|
82 |
void *real_value_p = NULL; |
483
bc26c42d2eec
fixed greg's crap in win32, enhanced debug stability, implemented preliminary retain
edouard
parents:
477
diff
changeset
|
83 |
char flags = 0; |
1432
8872223a675b
Optimized plc_debug.c generated code. Should produce smaller code size. Added statically initialized array for PLC tracable variable description.
Edouard Tisserant
parents:
1403
diff
changeset
|
84 |
UnpackVar(dsc, &real_value_p, &flags); |
483
bc26c42d2eec
fixed greg's crap in win32, enhanced debug stability, implemented preliminary retain
edouard
parents:
477
diff
changeset
|
85 |
|
507 | 86 |
if(flags & __IEC_RETAIN_FLAG){ |
1432
8872223a675b
Optimized plc_debug.c generated code. Should produce smaller code size. Added statically initialized array for PLC tracable variable description.
Edouard Tisserant
parents:
1403
diff
changeset
|
87 |
USINT size = __get_type_enum_size(dsc->type); |
450
18583d13f0fa
Preliminary accessor support for debug
Edouard TISSERANT <edouard.tisserant@gmail.com>
parents:
423
diff
changeset
|
88 |
/* compute next cursor positon*/ |
483
bc26c42d2eec
fixed greg's crap in win32, enhanced debug stability, implemented preliminary retain
edouard
parents:
477
diff
changeset
|
89 |
unsigned int next_retain_offset = retain_offset + size; |
450
18583d13f0fa
Preliminary accessor support for debug
Edouard TISSERANT <edouard.tisserant@gmail.com>
parents:
423
diff
changeset
|
90 |
/* if buffer not full */ |
605
2250ed42e306
debugger : forcing %M and %Q variables on each cycle, and rework of code for optimization and concision
Edouard Tisserant
parents:
582
diff
changeset
|
91 |
Remind(retain_offset, size, real_value_p); |
483
bc26c42d2eec
fixed greg's crap in win32, enhanced debug stability, implemented preliminary retain
edouard
parents:
477
diff
changeset
|
92 |
/* increment cursor according size*/ |
bc26c42d2eec
fixed greg's crap in win32, enhanced debug stability, implemented preliminary retain
edouard
parents:
477
diff
changeset
|
93 |
retain_offset = next_retain_offset; |
bc26c42d2eec
fixed greg's crap in win32, enhanced debug stability, implemented preliminary retain
edouard
parents:
477
diff
changeset
|
94 |
} |
bc26c42d2eec
fixed greg's crap in win32, enhanced debug stability, implemented preliminary retain
edouard
parents:
477
diff
changeset
|
95 |
} |
bc26c42d2eec
fixed greg's crap in win32, enhanced debug stability, implemented preliminary retain
edouard
parents:
477
diff
changeset
|
96 |
|
580 | 97 |
extern int CheckRetainBuffer(void); |
1457
ff7cfce737ca
Added PLCID variable accessible from C side, set with binarie's MD5. Added retain init and cleanup calls. Extended tests/python to test PLCID
Edouard Tisserant
parents:
1432
diff
changeset
|
98 |
extern void InitRetain(void); |
521
02cb9e5fb6f6
LPC transfer tested, added PLCInfo along MD5 checksum while invoking makefile
edouard
parents:
511
diff
changeset
|
99 |
|
483
bc26c42d2eec
fixed greg's crap in win32, enhanced debug stability, implemented preliminary retain
edouard
parents:
477
diff
changeset
|
100 |
void __init_debug(void) |
bc26c42d2eec
fixed greg's crap in win32, enhanced debug stability, implemented preliminary retain
edouard
parents:
477
diff
changeset
|
101 |
{ |
bc26c42d2eec
fixed greg's crap in win32, enhanced debug stability, implemented preliminary retain
edouard
parents:
477
diff
changeset
|
102 |
/* init local static vars */ |
2710
aaa1dc426213
plc_debug.c/var_acces.c : whitespace cleanup and other cosmetic changes
Edouard Tisserant <edouard.tisserant@gmail.com>
parents:
2632
diff
changeset
|
103 |
#ifndef TARGET_ONLINE_DEBUG_DISABLE |
483
bc26c42d2eec
fixed greg's crap in win32, enhanced debug stability, implemented preliminary retain
edouard
parents:
477
diff
changeset
|
104 |
buffer_cursor = debug_buffer; |
2501
eba2bbb2dd9a
Make online debug optional
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
2190
diff
changeset
|
105 |
buffer_state = BUFFER_FREE; |
eba2bbb2dd9a
Make online debug optional
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
2190
diff
changeset
|
106 |
#endif |
eba2bbb2dd9a
Make online debug optional
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
2190
diff
changeset
|
107 |
|
483
bc26c42d2eec
fixed greg's crap in win32, enhanced debug stability, implemented preliminary retain
edouard
parents:
477
diff
changeset
|
108 |
retain_offset = 0; |
1457
ff7cfce737ca
Added PLCID variable accessible from C side, set with binarie's MD5. Added retain init and cleanup calls. Extended tests/python to test PLCID
Edouard Tisserant
parents:
1432
diff
changeset
|
109 |
InitRetain(); |
483
bc26c42d2eec
fixed greg's crap in win32, enhanced debug stability, implemented preliminary retain
edouard
parents:
477
diff
changeset
|
110 |
/* Iterate over all variables to fill debug buffer */ |
1459
c9065fb5de0a
Added log message when RETAIN memory not valid
Edouard Tisserant
parents:
1457
diff
changeset
|
111 |
if(CheckRetainBuffer()){ |
2710
aaa1dc426213
plc_debug.c/var_acces.c : whitespace cleanup and other cosmetic changes
Edouard Tisserant <edouard.tisserant@gmail.com>
parents:
2632
diff
changeset
|
112 |
__for_each_variable_do(RemindIterator); |
1459
c9065fb5de0a
Added log message when RETAIN memory not valid
Edouard Tisserant
parents:
1457
diff
changeset
|
113 |
}else{ |
2710
aaa1dc426213
plc_debug.c/var_acces.c : whitespace cleanup and other cosmetic changes
Edouard Tisserant <edouard.tisserant@gmail.com>
parents:
2632
diff
changeset
|
114 |
char mstr[] = "RETAIN memory invalid - defaults used"; |
1459
c9065fb5de0a
Added log message when RETAIN memory not valid
Edouard Tisserant
parents:
1457
diff
changeset
|
115 |
LogMessage(LOG_WARNING, mstr, sizeof(mstr)); |
c9065fb5de0a
Added log message when RETAIN memory not valid
Edouard Tisserant
parents:
1457
diff
changeset
|
116 |
} |
483
bc26c42d2eec
fixed greg's crap in win32, enhanced debug stability, implemented preliminary retain
edouard
parents:
477
diff
changeset
|
117 |
retain_offset = 0; |
bc26c42d2eec
fixed greg's crap in win32, enhanced debug stability, implemented preliminary retain
edouard
parents:
477
diff
changeset
|
118 |
} |
bc26c42d2eec
fixed greg's crap in win32, enhanced debug stability, implemented preliminary retain
edouard
parents:
477
diff
changeset
|
119 |
|
bc26c42d2eec
fixed greg's crap in win32, enhanced debug stability, implemented preliminary retain
edouard
parents:
477
diff
changeset
|
120 |
extern void InitiateDebugTransfer(void); |
1457
ff7cfce737ca
Added PLCID variable accessible from C side, set with binarie's MD5. Added retain init and cleanup calls. Extended tests/python to test PLCID
Edouard Tisserant
parents:
1432
diff
changeset
|
121 |
extern void CleanupRetain(void); |
483
bc26c42d2eec
fixed greg's crap in win32, enhanced debug stability, implemented preliminary retain
edouard
parents:
477
diff
changeset
|
122 |
|
bc26c42d2eec
fixed greg's crap in win32, enhanced debug stability, implemented preliminary retain
edouard
parents:
477
diff
changeset
|
123 |
extern unsigned long __tick; |
bc26c42d2eec
fixed greg's crap in win32, enhanced debug stability, implemented preliminary retain
edouard
parents:
477
diff
changeset
|
124 |
|
bc26c42d2eec
fixed greg's crap in win32, enhanced debug stability, implemented preliminary retain
edouard
parents:
477
diff
changeset
|
125 |
void __cleanup_debug(void) |
bc26c42d2eec
fixed greg's crap in win32, enhanced debug stability, implemented preliminary retain
edouard
parents:
477
diff
changeset
|
126 |
{ |
2710
aaa1dc426213
plc_debug.c/var_acces.c : whitespace cleanup and other cosmetic changes
Edouard Tisserant <edouard.tisserant@gmail.com>
parents:
2632
diff
changeset
|
127 |
#ifndef TARGET_ONLINE_DEBUG_DISABLE |
483
bc26c42d2eec
fixed greg's crap in win32, enhanced debug stability, implemented preliminary retain
edouard
parents:
477
diff
changeset
|
128 |
buffer_cursor = debug_buffer; |
bc26c42d2eec
fixed greg's crap in win32, enhanced debug stability, implemented preliminary retain
edouard
parents:
477
diff
changeset
|
129 |
InitiateDebugTransfer(); |
2501
eba2bbb2dd9a
Make online debug optional
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
2190
diff
changeset
|
130 |
#endif |
eba2bbb2dd9a
Make online debug optional
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
2190
diff
changeset
|
131 |
|
1457
ff7cfce737ca
Added PLCID variable accessible from C side, set with binarie's MD5. Added retain init and cleanup calls. Extended tests/python to test PLCID
Edouard Tisserant
parents:
1432
diff
changeset
|
132 |
CleanupRetain(); |
483
bc26c42d2eec
fixed greg's crap in win32, enhanced debug stability, implemented preliminary retain
edouard
parents:
477
diff
changeset
|
133 |
} |
bc26c42d2eec
fixed greg's crap in win32, enhanced debug stability, implemented preliminary retain
edouard
parents:
477
diff
changeset
|
134 |
|
bc26c42d2eec
fixed greg's crap in win32, enhanced debug stability, implemented preliminary retain
edouard
parents:
477
diff
changeset
|
135 |
void __retrieve_debug(void) |
bc26c42d2eec
fixed greg's crap in win32, enhanced debug stability, implemented preliminary retain
edouard
parents:
477
diff
changeset
|
136 |
{ |
bc26c42d2eec
fixed greg's crap in win32, enhanced debug stability, implemented preliminary retain
edouard
parents:
477
diff
changeset
|
137 |
} |
bc26c42d2eec
fixed greg's crap in win32, enhanced debug stability, implemented preliminary retain
edouard
parents:
477
diff
changeset
|
138 |
|
bc26c42d2eec
fixed greg's crap in win32, enhanced debug stability, implemented preliminary retain
edouard
parents:
477
diff
changeset
|
139 |
|
bc26c42d2eec
fixed greg's crap in win32, enhanced debug stability, implemented preliminary retain
edouard
parents:
477
diff
changeset
|
140 |
void Retain(unsigned int offset, unsigned int count, void * p); |
605
2250ed42e306
debugger : forcing %M and %Q variables on each cycle, and rework of code for optimization and concision
Edouard Tisserant
parents:
582
diff
changeset
|
141 |
|
1479
8f41aa88aa46
fix many compilation warnings about static variables used by non-static functions
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1459
diff
changeset
|
142 |
static inline void BufferIterator(dbgvardsc_t *dsc, int do_debug) |
605
2250ed42e306
debugger : forcing %M and %Q variables on each cycle, and rework of code for optimization and concision
Edouard Tisserant
parents:
582
diff
changeset
|
143 |
{ |
2250ed42e306
debugger : forcing %M and %Q variables on each cycle, and rework of code for optimization and concision
Edouard Tisserant
parents:
582
diff
changeset
|
144 |
void *real_value_p = NULL; |
2250ed42e306
debugger : forcing %M and %Q variables on each cycle, and rework of code for optimization and concision
Edouard Tisserant
parents:
582
diff
changeset
|
145 |
void *visible_value_p = NULL; |
483
bc26c42d2eec
fixed greg's crap in win32, enhanced debug stability, implemented preliminary retain
edouard
parents:
477
diff
changeset
|
146 |
char flags = 0; |
605
2250ed42e306
debugger : forcing %M and %Q variables on each cycle, and rework of code for optimization and concision
Edouard Tisserant
parents:
582
diff
changeset
|
147 |
|
1432
8872223a675b
Optimized plc_debug.c generated code. Should produce smaller code size. Added statically initialized array for PLC tracable variable description.
Edouard Tisserant
parents:
1403
diff
changeset
|
148 |
visible_value_p = UnpackVar(dsc, &real_value_p, &flags); |
605
2250ed42e306
debugger : forcing %M and %Q variables on each cycle, and rework of code for optimization and concision
Edouard Tisserant
parents:
582
diff
changeset
|
149 |
|
2250ed42e306
debugger : forcing %M and %Q variables on each cycle, and rework of code for optimization and concision
Edouard Tisserant
parents:
582
diff
changeset
|
150 |
if(flags & ( __IEC_DEBUG_FLAG | __IEC_RETAIN_FLAG)){ |
1432
8872223a675b
Optimized plc_debug.c generated code. Should produce smaller code size. Added statically initialized array for PLC tracable variable description.
Edouard Tisserant
parents:
1403
diff
changeset
|
151 |
USINT size = __get_type_enum_size(dsc->type); |
2501
eba2bbb2dd9a
Make online debug optional
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
2190
diff
changeset
|
152 |
|
2710
aaa1dc426213
plc_debug.c/var_acces.c : whitespace cleanup and other cosmetic changes
Edouard Tisserant <edouard.tisserant@gmail.com>
parents:
2632
diff
changeset
|
153 |
#ifndef TARGET_ONLINE_DEBUG_DISABLE |
483
bc26c42d2eec
fixed greg's crap in win32, enhanced debug stability, implemented preliminary retain
edouard
parents:
477
diff
changeset
|
154 |
if(flags & __IEC_DEBUG_FLAG){ |
605
2250ed42e306
debugger : forcing %M and %Q variables on each cycle, and rework of code for optimization and concision
Edouard Tisserant
parents:
582
diff
changeset
|
155 |
/* copy visible variable to buffer */; |
2250ed42e306
debugger : forcing %M and %Q variables on each cycle, and rework of code for optimization and concision
Edouard Tisserant
parents:
582
diff
changeset
|
156 |
if(do_debug){ |
2250ed42e306
debugger : forcing %M and %Q variables on each cycle, and rework of code for optimization and concision
Edouard Tisserant
parents:
582
diff
changeset
|
157 |
/* compute next cursor positon. |
2250ed42e306
debugger : forcing %M and %Q variables on each cycle, and rework of code for optimization and concision
Edouard Tisserant
parents:
582
diff
changeset
|
158 |
No need to check overflow, as BUFFER_SIZE |
2250ed42e306
debugger : forcing %M and %Q variables on each cycle, and rework of code for optimization and concision
Edouard Tisserant
parents:
582
diff
changeset
|
159 |
is computed large enough */ |
2710
aaa1dc426213
plc_debug.c/var_acces.c : whitespace cleanup and other cosmetic changes
Edouard Tisserant <edouard.tisserant@gmail.com>
parents:
2632
diff
changeset
|
160 |
if(__Is_a_string(dsc)){ |
1074
92a009dc5826
Optimzed tracing of STRING type variables value. Now, only used size is transfered in debug buffer.
Edouard Tisserant
parents:
985
diff
changeset
|
161 |
/* optimization for strings */ |
92a009dc5826
Optimzed tracing of STRING type variables value. Now, only used size is transfered in debug buffer.
Edouard Tisserant
parents:
985
diff
changeset
|
162 |
size = ((STRING*)visible_value_p)->len + 1; |
92a009dc5826
Optimzed tracing of STRING type variables value. Now, only used size is transfered in debug buffer.
Edouard Tisserant
parents:
985
diff
changeset
|
163 |
} |
605
2250ed42e306
debugger : forcing %M and %Q variables on each cycle, and rework of code for optimization and concision
Edouard Tisserant
parents:
582
diff
changeset
|
164 |
char* next_cursor = buffer_cursor + size; |
2250ed42e306
debugger : forcing %M and %Q variables on each cycle, and rework of code for optimization and concision
Edouard Tisserant
parents:
582
diff
changeset
|
165 |
/* copy data to the buffer */ |
2250ed42e306
debugger : forcing %M and %Q variables on each cycle, and rework of code for optimization and concision
Edouard Tisserant
parents:
582
diff
changeset
|
166 |
memcpy(buffer_cursor, visible_value_p, size); |
2250ed42e306
debugger : forcing %M and %Q variables on each cycle, and rework of code for optimization and concision
Edouard Tisserant
parents:
582
diff
changeset
|
167 |
/* increment cursor according size*/ |
2250ed42e306
debugger : forcing %M and %Q variables on each cycle, and rework of code for optimization and concision
Edouard Tisserant
parents:
582
diff
changeset
|
168 |
buffer_cursor = next_cursor; |
2250ed42e306
debugger : forcing %M and %Q variables on each cycle, and rework of code for optimization and concision
Edouard Tisserant
parents:
582
diff
changeset
|
169 |
} |
2250ed42e306
debugger : forcing %M and %Q variables on each cycle, and rework of code for optimization and concision
Edouard Tisserant
parents:
582
diff
changeset
|
170 |
/* re-force real value of outputs (M and Q)*/ |
649
c48023b6f0ec
Fixing bug in forcing variables in runtime debug thread
laurent
parents:
611
diff
changeset
|
171 |
if((flags & __IEC_FORCE_FLAG) && (flags & __IEC_OUTPUT_FLAG)){ |
605
2250ed42e306
debugger : forcing %M and %Q variables on each cycle, and rework of code for optimization and concision
Edouard Tisserant
parents:
582
diff
changeset
|
172 |
memcpy(real_value_p, visible_value_p, size); |
2250ed42e306
debugger : forcing %M and %Q variables on each cycle, and rework of code for optimization and concision
Edouard Tisserant
parents:
582
diff
changeset
|
173 |
} |
450
18583d13f0fa
Preliminary accessor support for debug
Edouard TISSERANT <edouard.tisserant@gmail.com>
parents:
423
diff
changeset
|
174 |
} |
2710
aaa1dc426213
plc_debug.c/var_acces.c : whitespace cleanup and other cosmetic changes
Edouard Tisserant <edouard.tisserant@gmail.com>
parents:
2632
diff
changeset
|
175 |
#endif |
2501
eba2bbb2dd9a
Make online debug optional
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
2190
diff
changeset
|
176 |
|
483
bc26c42d2eec
fixed greg's crap in win32, enhanced debug stability, implemented preliminary retain
edouard
parents:
477
diff
changeset
|
177 |
if(flags & __IEC_RETAIN_FLAG){ |
605
2250ed42e306
debugger : forcing %M and %Q variables on each cycle, and rework of code for optimization and concision
Edouard Tisserant
parents:
582
diff
changeset
|
178 |
/* compute next cursor positon*/ |
2250ed42e306
debugger : forcing %M and %Q variables on each cycle, and rework of code for optimization and concision
Edouard Tisserant
parents:
582
diff
changeset
|
179 |
unsigned int next_retain_offset = retain_offset + size; |
2250ed42e306
debugger : forcing %M and %Q variables on each cycle, and rework of code for optimization and concision
Edouard Tisserant
parents:
582
diff
changeset
|
180 |
/* if buffer not full */ |
2250ed42e306
debugger : forcing %M and %Q variables on each cycle, and rework of code for optimization and concision
Edouard Tisserant
parents:
582
diff
changeset
|
181 |
Retain(retain_offset, size, real_value_p); |
2250ed42e306
debugger : forcing %M and %Q variables on each cycle, and rework of code for optimization and concision
Edouard Tisserant
parents:
582
diff
changeset
|
182 |
/* increment cursor according size*/ |
2250ed42e306
debugger : forcing %M and %Q variables on each cycle, and rework of code for optimization and concision
Edouard Tisserant
parents:
582
diff
changeset
|
183 |
retain_offset = next_retain_offset; |
483
bc26c42d2eec
fixed greg's crap in win32, enhanced debug stability, implemented preliminary retain
edouard
parents:
477
diff
changeset
|
184 |
} |
bc26c42d2eec
fixed greg's crap in win32, enhanced debug stability, implemented preliminary retain
edouard
parents:
477
diff
changeset
|
185 |
} |
bc26c42d2eec
fixed greg's crap in win32, enhanced debug stability, implemented preliminary retain
edouard
parents:
477
diff
changeset
|
186 |
} |
bc26c42d2eec
fixed greg's crap in win32, enhanced debug stability, implemented preliminary retain
edouard
parents:
477
diff
changeset
|
187 |
|
1432
8872223a675b
Optimized plc_debug.c generated code. Should produce smaller code size. Added statically initialized array for PLC tracable variable description.
Edouard Tisserant
parents:
1403
diff
changeset
|
188 |
void DebugIterator(dbgvardsc_t *dsc){ |
8872223a675b
Optimized plc_debug.c generated code. Should produce smaller code size. Added statically initialized array for PLC tracable variable description.
Edouard Tisserant
parents:
1403
diff
changeset
|
189 |
BufferIterator(dsc, 1); |
8872223a675b
Optimized plc_debug.c generated code. Should produce smaller code size. Added statically initialized array for PLC tracable variable description.
Edouard Tisserant
parents:
1403
diff
changeset
|
190 |
} |
8872223a675b
Optimized plc_debug.c generated code. Should produce smaller code size. Added statically initialized array for PLC tracable variable description.
Edouard Tisserant
parents:
1403
diff
changeset
|
191 |
|
8872223a675b
Optimized plc_debug.c generated code. Should produce smaller code size. Added statically initialized array for PLC tracable variable description.
Edouard Tisserant
parents:
1403
diff
changeset
|
192 |
void RetainIterator(dbgvardsc_t *dsc){ |
8872223a675b
Optimized plc_debug.c generated code. Should produce smaller code size. Added statically initialized array for PLC tracable variable description.
Edouard Tisserant
parents:
1403
diff
changeset
|
193 |
BufferIterator(dsc, 0); |
483
bc26c42d2eec
fixed greg's crap in win32, enhanced debug stability, implemented preliminary retain
edouard
parents:
477
diff
changeset
|
194 |
} |
bc26c42d2eec
fixed greg's crap in win32, enhanced debug stability, implemented preliminary retain
edouard
parents:
477
diff
changeset
|
195 |
|
2172
9fa5be79bb77
Add helper function GetRetainSize()
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1800
diff
changeset
|
196 |
|
9fa5be79bb77
Add helper function GetRetainSize()
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1800
diff
changeset
|
197 |
unsigned int retain_size = 0; |
9fa5be79bb77
Add helper function GetRetainSize()
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1800
diff
changeset
|
198 |
|
9fa5be79bb77
Add helper function GetRetainSize()
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1800
diff
changeset
|
199 |
/* GetRetainSizeIterator */ |
9fa5be79bb77
Add helper function GetRetainSize()
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1800
diff
changeset
|
200 |
void GetRetainSizeIterator(dbgvardsc_t *dsc) |
9fa5be79bb77
Add helper function GetRetainSize()
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1800
diff
changeset
|
201 |
{ |
9fa5be79bb77
Add helper function GetRetainSize()
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1800
diff
changeset
|
202 |
void *real_value_p = NULL; |
9fa5be79bb77
Add helper function GetRetainSize()
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1800
diff
changeset
|
203 |
char flags = 0; |
9fa5be79bb77
Add helper function GetRetainSize()
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1800
diff
changeset
|
204 |
UnpackVar(dsc, &real_value_p, &flags); |
9fa5be79bb77
Add helper function GetRetainSize()
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1800
diff
changeset
|
205 |
|
9fa5be79bb77
Add helper function GetRetainSize()
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1800
diff
changeset
|
206 |
if(flags & __IEC_RETAIN_FLAG){ |
9fa5be79bb77
Add helper function GetRetainSize()
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1800
diff
changeset
|
207 |
USINT size = __get_type_enum_size(dsc->type); |
9fa5be79bb77
Add helper function GetRetainSize()
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1800
diff
changeset
|
208 |
/* Calc retain buffer size */ |
9fa5be79bb77
Add helper function GetRetainSize()
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1800
diff
changeset
|
209 |
retain_size += size; |
9fa5be79bb77
Add helper function GetRetainSize()
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1800
diff
changeset
|
210 |
} |
9fa5be79bb77
Add helper function GetRetainSize()
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1800
diff
changeset
|
211 |
} |
9fa5be79bb77
Add helper function GetRetainSize()
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1800
diff
changeset
|
212 |
|
9fa5be79bb77
Add helper function GetRetainSize()
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1800
diff
changeset
|
213 |
/* Return size of all retain variables */ |
9fa5be79bb77
Add helper function GetRetainSize()
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1800
diff
changeset
|
214 |
unsigned int GetRetainSize(void) |
9fa5be79bb77
Add helper function GetRetainSize()
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1800
diff
changeset
|
215 |
{ |
9fa5be79bb77
Add helper function GetRetainSize()
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1800
diff
changeset
|
216 |
__for_each_variable_do(GetRetainSizeIterator); |
9fa5be79bb77
Add helper function GetRetainSize()
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1800
diff
changeset
|
217 |
return retain_size; |
9fa5be79bb77
Add helper function GetRetainSize()
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1800
diff
changeset
|
218 |
} |
9fa5be79bb77
Add helper function GetRetainSize()
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1800
diff
changeset
|
219 |
|
9fa5be79bb77
Add helper function GetRetainSize()
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
1800
diff
changeset
|
220 |
|
969 | 221 |
extern void PLC_GetTime(IEC_TIME*); |
483
bc26c42d2eec
fixed greg's crap in win32, enhanced debug stability, implemented preliminary retain
edouard
parents:
477
diff
changeset
|
222 |
extern int TryEnterDebugSection(void); |
bc26c42d2eec
fixed greg's crap in win32, enhanced debug stability, implemented preliminary retain
edouard
parents:
477
diff
changeset
|
223 |
extern long AtomicCompareExchange(long*, long, long); |
954 | 224 |
extern long long AtomicCompareExchange64(long long* , long long , long long); |
483
bc26c42d2eec
fixed greg's crap in win32, enhanced debug stability, implemented preliminary retain
edouard
parents:
477
diff
changeset
|
225 |
extern void LeaveDebugSection(void); |
580 | 226 |
extern void ValidateRetainBuffer(void); |
227 |
extern void InValidateRetainBuffer(void); |
|
450
18583d13f0fa
Preliminary accessor support for debug
Edouard TISSERANT <edouard.tisserant@gmail.com>
parents:
423
diff
changeset
|
228 |
|
423 | 229 |
void __publish_debug(void) |
209
08dc3d064cb5
Moved template C code to targets dir. Cleaned up some forgotten print.
etisserant
parents:
diff
changeset
|
230 |
{ |
483
bc26c42d2eec
fixed greg's crap in win32, enhanced debug stability, implemented preliminary retain
edouard
parents:
477
diff
changeset
|
231 |
retain_offset = 0; |
580 | 232 |
InValidateRetainBuffer(); |
2501
eba2bbb2dd9a
Make online debug optional
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
2190
diff
changeset
|
233 |
|
eba2bbb2dd9a
Make online debug optional
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
2190
diff
changeset
|
234 |
#ifndef TARGET_ONLINE_DEBUG_DISABLE |
239
112b4bc523b3
Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents:
236
diff
changeset
|
235 |
/* Check there is no running debugger re-configuration */ |
112b4bc523b3
Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents:
236
diff
changeset
|
236 |
if(TryEnterDebugSection()){ |
112b4bc523b3
Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents:
236
diff
changeset
|
237 |
/* Lock buffer */ |
112b4bc523b3
Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents:
236
diff
changeset
|
238 |
long latest_state = AtomicCompareExchange( |
112b4bc523b3
Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents:
236
diff
changeset
|
239 |
&buffer_state, |
112b4bc523b3
Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents:
236
diff
changeset
|
240 |
BUFFER_FREE, |
112b4bc523b3
Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents:
236
diff
changeset
|
241 |
BUFFER_BUSY); |
112b4bc523b3
Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents:
236
diff
changeset
|
242 |
|
112b4bc523b3
Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents:
236
diff
changeset
|
243 |
/* If buffer was free */ |
112b4bc523b3
Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents:
236
diff
changeset
|
244 |
if(latest_state == BUFFER_FREE) |
209
08dc3d064cb5
Moved template C code to targets dir. Cleaned up some forgotten print.
etisserant
parents:
diff
changeset
|
245 |
{ |
239
112b4bc523b3
Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents:
236
diff
changeset
|
246 |
/* Reset buffer cursor */ |
112b4bc523b3
Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents:
236
diff
changeset
|
247 |
buffer_cursor = debug_buffer; |
450
18583d13f0fa
Preliminary accessor support for debug
Edouard TISSERANT <edouard.tisserant@gmail.com>
parents:
423
diff
changeset
|
248 |
/* Iterate over all variables to fill debug buffer */ |
605
2250ed42e306
debugger : forcing %M and %Q variables on each cycle, and rework of code for optimization and concision
Edouard Tisserant
parents:
582
diff
changeset
|
249 |
__for_each_variable_do(DebugIterator); |
239
112b4bc523b3
Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents:
236
diff
changeset
|
250 |
|
112b4bc523b3
Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents:
236
diff
changeset
|
251 |
/* Leave debug section, |
112b4bc523b3
Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents:
236
diff
changeset
|
252 |
* Trigger asynchronous transmission |
112b4bc523b3
Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents:
236
diff
changeset
|
253 |
* (returns immediately) */ |
112b4bc523b3
Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents:
236
diff
changeset
|
254 |
InitiateDebugTransfer(); /* size */ |
581 | 255 |
}else{ |
256 |
/* when not debugging, do only retain */ |
|
257 |
__for_each_variable_do(RetainIterator); |
|
209
08dc3d064cb5
Moved template C code to targets dir. Cleaned up some forgotten print.
etisserant
parents:
diff
changeset
|
258 |
} |
239
112b4bc523b3
Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents:
236
diff
changeset
|
259 |
LeaveDebugSection(); |
2501
eba2bbb2dd9a
Make online debug optional
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
2190
diff
changeset
|
260 |
}else |
eba2bbb2dd9a
Make online debug optional
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
2190
diff
changeset
|
261 |
#endif |
eba2bbb2dd9a
Make online debug optional
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
2190
diff
changeset
|
262 |
{ |
483
bc26c42d2eec
fixed greg's crap in win32, enhanced debug stability, implemented preliminary retain
edouard
parents:
477
diff
changeset
|
263 |
/* when not debugging, do only retain */ |
bc26c42d2eec
fixed greg's crap in win32, enhanced debug stability, implemented preliminary retain
edouard
parents:
477
diff
changeset
|
264 |
__for_each_variable_do(RetainIterator); |
209
08dc3d064cb5
Moved template C code to targets dir. Cleaned up some forgotten print.
etisserant
parents:
diff
changeset
|
265 |
} |
580 | 266 |
ValidateRetainBuffer(); |
209
08dc3d064cb5
Moved template C code to targets dir. Cleaned up some forgotten print.
etisserant
parents:
diff
changeset
|
267 |
} |
08dc3d064cb5
Moved template C code to targets dir. Cleaned up some forgotten print.
etisserant
parents:
diff
changeset
|
268 |
|
2501
eba2bbb2dd9a
Make online debug optional
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
2190
diff
changeset
|
269 |
#ifndef TARGET_ONLINE_DEBUG_DISABLE |
450
18583d13f0fa
Preliminary accessor support for debug
Edouard TISSERANT <edouard.tisserant@gmail.com>
parents:
423
diff
changeset
|
270 |
#define __RegisterDebugVariable_case_t(TYPENAME) \ |
18583d13f0fa
Preliminary accessor support for debug
Edouard TISSERANT <edouard.tisserant@gmail.com>
parents:
423
diff
changeset
|
271 |
case TYPENAME##_ENUM :\ |
477
f66a092b6e74
Arbitrary variable forcing
Edouard TISSERANT <edouard.tisserant@gmail.com>
parents:
458
diff
changeset
|
272 |
((__IEC_##TYPENAME##_t *)varp)->flags |= flags;\ |
f66a092b6e74
Arbitrary variable forcing
Edouard TISSERANT <edouard.tisserant@gmail.com>
parents:
458
diff
changeset
|
273 |
if(force)\ |
f66a092b6e74
Arbitrary variable forcing
Edouard TISSERANT <edouard.tisserant@gmail.com>
parents:
458
diff
changeset
|
274 |
((__IEC_##TYPENAME##_t *)varp)->value = *((TYPENAME *)force);\ |
458
dfc6164e4022
Debugger still doesn't work crash less...
Edouard TISSERANT <edouard.tisserant@gmail.com>
parents:
452
diff
changeset
|
275 |
break; |
450
18583d13f0fa
Preliminary accessor support for debug
Edouard TISSERANT <edouard.tisserant@gmail.com>
parents:
423
diff
changeset
|
276 |
#define __RegisterDebugVariable_case_p(TYPENAME)\ |
18583d13f0fa
Preliminary accessor support for debug
Edouard TISSERANT <edouard.tisserant@gmail.com>
parents:
423
diff
changeset
|
277 |
case TYPENAME##_P_ENUM :\ |
477
f66a092b6e74
Arbitrary variable forcing
Edouard TISSERANT <edouard.tisserant@gmail.com>
parents:
458
diff
changeset
|
278 |
((__IEC_##TYPENAME##_p *)varp)->flags |= flags;\ |
f66a092b6e74
Arbitrary variable forcing
Edouard TISSERANT <edouard.tisserant@gmail.com>
parents:
458
diff
changeset
|
279 |
if(force)\ |
f66a092b6e74
Arbitrary variable forcing
Edouard TISSERANT <edouard.tisserant@gmail.com>
parents:
458
diff
changeset
|
280 |
((__IEC_##TYPENAME##_p *)varp)->fvalue = *((TYPENAME *)force);\ |
511 | 281 |
break;\ |
282 |
case TYPENAME##_O_ENUM :\ |
|
283 |
((__IEC_##TYPENAME##_p *)varp)->flags |= flags;\ |
|
582
bb5d0367bf32
Fix typo in plc_debug.c
Edouqrd Tisserant <edouard.tisserant@gmail.com>
parents:
581
diff
changeset
|
284 |
if(force){\ |
511 | 285 |
((__IEC_##TYPENAME##_p *)varp)->fvalue = *((TYPENAME *)force);\ |
286 |
*(((__IEC_##TYPENAME##_p *)varp)->value) = *((TYPENAME *)force);\ |
|
582
bb5d0367bf32
Fix typo in plc_debug.c
Edouqrd Tisserant <edouard.tisserant@gmail.com>
parents:
581
diff
changeset
|
287 |
}\ |
477
f66a092b6e74
Arbitrary variable forcing
Edouard TISSERANT <edouard.tisserant@gmail.com>
parents:
458
diff
changeset
|
288 |
break; |
2190
b7d803fc44db
Fix compilation warning/error: comparison between signed and unsigned integer expressions [-Werror=sign-compare]
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
2172
diff
changeset
|
289 |
void RegisterDebugVariable(unsigned int idx, void* force) |
209
08dc3d064cb5
Moved template C code to targets dir. Cleaned up some forgotten print.
etisserant
parents:
diff
changeset
|
290 |
{ |
1432
8872223a675b
Optimized plc_debug.c generated code. Should produce smaller code size. Added statically initialized array for PLC tracable variable description.
Edouard Tisserant
parents:
1403
diff
changeset
|
291 |
if(idx < sizeof(dbgvardsc)/sizeof(dbgvardsc_t)){ |
8872223a675b
Optimized plc_debug.c generated code. Should produce smaller code size. Added statically initialized array for PLC tracable variable description.
Edouard Tisserant
parents:
1403
diff
changeset
|
292 |
unsigned char flags = force ? |
8872223a675b
Optimized plc_debug.c generated code. Should produce smaller code size. Added statically initialized array for PLC tracable variable description.
Edouard Tisserant
parents:
1403
diff
changeset
|
293 |
__IEC_DEBUG_FLAG | __IEC_FORCE_FLAG : |
8872223a675b
Optimized plc_debug.c generated code. Should produce smaller code size. Added statically initialized array for PLC tracable variable description.
Edouard Tisserant
parents:
1403
diff
changeset
|
294 |
__IEC_DEBUG_FLAG; |
8872223a675b
Optimized plc_debug.c generated code. Should produce smaller code size. Added statically initialized array for PLC tracable variable description.
Edouard Tisserant
parents:
1403
diff
changeset
|
295 |
dbgvardsc_t *dsc = &dbgvardsc[idx]; |
8872223a675b
Optimized plc_debug.c generated code. Should produce smaller code size. Added statically initialized array for PLC tracable variable description.
Edouard Tisserant
parents:
1403
diff
changeset
|
296 |
void *varp = dsc->ptr; |
8872223a675b
Optimized plc_debug.c generated code. Should produce smaller code size. Added statically initialized array for PLC tracable variable description.
Edouard Tisserant
parents:
1403
diff
changeset
|
297 |
switch(dsc->type){ |
8872223a675b
Optimized plc_debug.c generated code. Should produce smaller code size. Added statically initialized array for PLC tracable variable description.
Edouard Tisserant
parents:
1403
diff
changeset
|
298 |
__ANY(__RegisterDebugVariable_case_t) |
8872223a675b
Optimized plc_debug.c generated code. Should produce smaller code size. Added statically initialized array for PLC tracable variable description.
Edouard Tisserant
parents:
1403
diff
changeset
|
299 |
__ANY(__RegisterDebugVariable_case_p) |
8872223a675b
Optimized plc_debug.c generated code. Should produce smaller code size. Added statically initialized array for PLC tracable variable description.
Edouard Tisserant
parents:
1403
diff
changeset
|
300 |
default: |
8872223a675b
Optimized plc_debug.c generated code. Should produce smaller code size. Added statically initialized array for PLC tracable variable description.
Edouard Tisserant
parents:
1403
diff
changeset
|
301 |
break; |
8872223a675b
Optimized plc_debug.c generated code. Should produce smaller code size. Added statically initialized array for PLC tracable variable description.
Edouard Tisserant
parents:
1403
diff
changeset
|
302 |
} |
450
18583d13f0fa
Preliminary accessor support for debug
Edouard TISSERANT <edouard.tisserant@gmail.com>
parents:
423
diff
changeset
|
303 |
} |
18583d13f0fa
Preliminary accessor support for debug
Edouard TISSERANT <edouard.tisserant@gmail.com>
parents:
423
diff
changeset
|
304 |
} |
18583d13f0fa
Preliminary accessor support for debug
Edouard TISSERANT <edouard.tisserant@gmail.com>
parents:
423
diff
changeset
|
305 |
|
18583d13f0fa
Preliminary accessor support for debug
Edouard TISSERANT <edouard.tisserant@gmail.com>
parents:
423
diff
changeset
|
306 |
#define __ResetDebugVariablesIterator_case_t(TYPENAME) \ |
18583d13f0fa
Preliminary accessor support for debug
Edouard TISSERANT <edouard.tisserant@gmail.com>
parents:
423
diff
changeset
|
307 |
case TYPENAME##_ENUM :\ |
477
f66a092b6e74
Arbitrary variable forcing
Edouard TISSERANT <edouard.tisserant@gmail.com>
parents:
458
diff
changeset
|
308 |
((__IEC_##TYPENAME##_t *)varp)->flags &= ~(__IEC_DEBUG_FLAG|__IEC_FORCE_FLAG);\ |
458
dfc6164e4022
Debugger still doesn't work crash less...
Edouard TISSERANT <edouard.tisserant@gmail.com>
parents:
452
diff
changeset
|
309 |
break; |
450
18583d13f0fa
Preliminary accessor support for debug
Edouard TISSERANT <edouard.tisserant@gmail.com>
parents:
423
diff
changeset
|
310 |
|
18583d13f0fa
Preliminary accessor support for debug
Edouard TISSERANT <edouard.tisserant@gmail.com>
parents:
423
diff
changeset
|
311 |
#define __ResetDebugVariablesIterator_case_p(TYPENAME)\ |
18583d13f0fa
Preliminary accessor support for debug
Edouard TISSERANT <edouard.tisserant@gmail.com>
parents:
423
diff
changeset
|
312 |
case TYPENAME##_P_ENUM :\ |
582
bb5d0367bf32
Fix typo in plc_debug.c
Edouqrd Tisserant <edouard.tisserant@gmail.com>
parents:
581
diff
changeset
|
313 |
case TYPENAME##_O_ENUM :\ |
477
f66a092b6e74
Arbitrary variable forcing
Edouard TISSERANT <edouard.tisserant@gmail.com>
parents:
458
diff
changeset
|
314 |
((__IEC_##TYPENAME##_p *)varp)->flags &= ~(__IEC_DEBUG_FLAG|__IEC_FORCE_FLAG);\ |
458
dfc6164e4022
Debugger still doesn't work crash less...
Edouard TISSERANT <edouard.tisserant@gmail.com>
parents:
452
diff
changeset
|
315 |
break; |
450
18583d13f0fa
Preliminary accessor support for debug
Edouard TISSERANT <edouard.tisserant@gmail.com>
parents:
423
diff
changeset
|
316 |
|
1432
8872223a675b
Optimized plc_debug.c generated code. Should produce smaller code size. Added statically initialized array for PLC tracable variable description.
Edouard Tisserant
parents:
1403
diff
changeset
|
317 |
void ResetDebugVariablesIterator(dbgvardsc_t *dsc) |
450
18583d13f0fa
Preliminary accessor support for debug
Edouard TISSERANT <edouard.tisserant@gmail.com>
parents:
423
diff
changeset
|
318 |
{ |
18583d13f0fa
Preliminary accessor support for debug
Edouard TISSERANT <edouard.tisserant@gmail.com>
parents:
423
diff
changeset
|
319 |
/* force debug flag to 0*/ |
1432
8872223a675b
Optimized plc_debug.c generated code. Should produce smaller code size. Added statically initialized array for PLC tracable variable description.
Edouard Tisserant
parents:
1403
diff
changeset
|
320 |
void *varp = dsc->ptr; |
8872223a675b
Optimized plc_debug.c generated code. Should produce smaller code size. Added statically initialized array for PLC tracable variable description.
Edouard Tisserant
parents:
1403
diff
changeset
|
321 |
switch(dsc->type){ |
611 | 322 |
__ANY(__ResetDebugVariablesIterator_case_t) |
323 |
__ANY(__ResetDebugVariablesIterator_case_p) |
|
452
2d0718a05cc7
Reflect changes in iec type definitions in matiec/lib
edouard
parents:
450
diff
changeset
|
324 |
default: |
2d0718a05cc7
Reflect changes in iec type definitions in matiec/lib
edouard
parents:
450
diff
changeset
|
325 |
break; |
209
08dc3d064cb5
Moved template C code to targets dir. Cleaned up some forgotten print.
etisserant
parents:
diff
changeset
|
326 |
} |
08dc3d064cb5
Moved template C code to targets dir. Cleaned up some forgotten print.
etisserant
parents:
diff
changeset
|
327 |
} |
08dc3d064cb5
Moved template C code to targets dir. Cleaned up some forgotten print.
etisserant
parents:
diff
changeset
|
328 |
|
08dc3d064cb5
Moved template C code to targets dir. Cleaned up some forgotten print.
etisserant
parents:
diff
changeset
|
329 |
void ResetDebugVariables(void) |
08dc3d064cb5
Moved template C code to targets dir. Cleaned up some forgotten print.
etisserant
parents:
diff
changeset
|
330 |
{ |
450
18583d13f0fa
Preliminary accessor support for debug
Edouard TISSERANT <edouard.tisserant@gmail.com>
parents:
423
diff
changeset
|
331 |
__for_each_variable_do(ResetDebugVariablesIterator); |
209
08dc3d064cb5
Moved template C code to targets dir. Cleaned up some forgotten print.
etisserant
parents:
diff
changeset
|
332 |
} |
08dc3d064cb5
Moved template C code to targets dir. Cleaned up some forgotten print.
etisserant
parents:
diff
changeset
|
333 |
|
423 | 334 |
void FreeDebugData(void) |
209
08dc3d064cb5
Moved template C code to targets dir. Cleaned up some forgotten print.
etisserant
parents:
diff
changeset
|
335 |
{ |
08dc3d064cb5
Moved template C code to targets dir. Cleaned up some forgotten print.
etisserant
parents:
diff
changeset
|
336 |
/* atomically mark buffer as free */ |
1403 | 337 |
AtomicCompareExchange( |
209
08dc3d064cb5
Moved template C code to targets dir. Cleaned up some forgotten print.
etisserant
parents:
diff
changeset
|
338 |
&buffer_state, |
08dc3d064cb5
Moved template C code to targets dir. Cleaned up some forgotten print.
etisserant
parents:
diff
changeset
|
339 |
BUFFER_BUSY, |
08dc3d064cb5
Moved template C code to targets dir. Cleaned up some forgotten print.
etisserant
parents:
diff
changeset
|
340 |
BUFFER_FREE); |
08dc3d064cb5
Moved template C code to targets dir. Cleaned up some forgotten print.
etisserant
parents:
diff
changeset
|
341 |
} |
452
2d0718a05cc7
Reflect changes in iec type definitions in matiec/lib
edouard
parents:
450
diff
changeset
|
342 |
int WaitDebugData(unsigned long *tick); |
450
18583d13f0fa
Preliminary accessor support for debug
Edouard TISSERANT <edouard.tisserant@gmail.com>
parents:
423
diff
changeset
|
343 |
/* Wait until debug data ready and return pointer to it */ |
18583d13f0fa
Preliminary accessor support for debug
Edouard TISSERANT <edouard.tisserant@gmail.com>
parents:
423
diff
changeset
|
344 |
int GetDebugData(unsigned long *tick, unsigned long *size, void **buffer){ |
504 | 345 |
int wait_error = WaitDebugData(tick); |
346 |
if(!wait_error){ |
|
502 | 347 |
*size = buffer_cursor - debug_buffer; |
348 |
*buffer = debug_buffer; |
|
349 |
} |
|
504 | 350 |
return wait_error; |
351 |
} |
|
2501
eba2bbb2dd9a
Make online debug optional
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
2190
diff
changeset
|
352 |
#endif |
eba2bbb2dd9a
Make online debug optional
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
2190
diff
changeset
|
353 |
#endif |
eba2bbb2dd9a
Make online debug optional
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents:
2190
diff
changeset
|
354 |