QB64/QB64-PE
QB64/QB64-PE
1
1
Fork 0
mirror of https://github.com/QB64-Phoenix-Edition/QB64pe.git synced 2024-06-29 11:40:38 +00:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/origin/var-export' into var-export

Browse source
This commit is contained in:
Fellippe Heitor 2021-07-30 12:02:41 -03:00
parent 1f537362e0 b8e6d29959
commit 0f8d345cb1
3 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
internal/c/libqb.cpp
View file

@ -21740,14 +21740,18 @@ void sub_put2(int32 i,int64 offset,void *element,int32 passed){
void tcp_out(void *connection,void *offset,ptrszint bytes){
#if !defined(DEPENDENCY_SOCKETS)
#elif defined(QB64_WINDOWS) || defined(QB64_UNIX)
#elif defined(QB64_WINDOWS) || defined(QB64_UNIX)
// Handle Windows which might not have this flag (it would be a no-op anyway)
#if !defined(MSG_NOSIGNAL)
#define MSG_NOSIGNAL 0
#endif
tcp_connection *tcp; tcp=(tcp_connection*)connection;
int total = 0; // how many bytes we've sent
int bytesleft = bytes; // how many we have left to send
int n;
while(total < bytes) {
n = send(tcp->socket, (char*)((char *)offset + total), bytesleft, 0);
n = send(tcp->socket, (char*)((char *)offset + total), bytesleft, MSG_NOSIGNAL);
if (n < 0) {
tcp->connected = 0;
return;

6
internal/support/vwatch/vwatch.bm
View file

@ -218,7 +218,7 @@ SUB vwatch (globalVariables AS _OFFSET, localVariables AS _OFFSET)
vw_address = _OFFSET(globalVariables) + LEN(vw_address) * vw_localIndex
vw_address = _MEMGET(vw_m, vw_address, _OFFSET) 'first resolve pass
vw_address = _MEMGET(vw_m, vw_address, _OFFSET) 'second resolve pass
vw_cmd$ = "global var:" + MKL$(vw_tempIndex) + STR$(vw_address)
vw_cmd$ = "global var:" + MKL$(vw_tempIndex) + _MK$(_OFFSET, vw_address)
GOSUB SendCommand
CASE "local var"
vw_tempIndex = CVL(LEFT$(vw_value$, 4))
@ -228,14 +228,14 @@ SUB vwatch (globalVariables AS _OFFSET, localVariables AS _OFFSET)
vw_address = _OFFSET(localVariables) + LEN(vw_address) * vw_localIndex
vw_address = _MEMGET(vw_m, vw_address, _OFFSET) 'first resolve pass
vw_address = _MEMGET(vw_m, vw_address, _OFFSET) 'second resolve pass
vw_cmd$ = "local var:" + MKL$(vw_tempIndex) + STR$(vw_address)
vw_cmd$ = "local var:" + MKL$(vw_tempIndex) + _MK$(_OFFSET, vw_address)
GOSUB SendCommand
END IF
CASE "get address"
vw_tempIndex = CVL(LEFT$(vw_value$, 4))
vw_sequence = CVI(MID$(vw_value$, 5, 2))
vw_varSize = CVL(MID$(vw_value$, 7, 4))
vw_address = VAL(MID$(vw_value$, 11))
vw_address = _CV(_OFFSET, MID$(vw_value$, 11))
vw_buf$ = SPACE$(vw_varSize)
vw_m = _MEM(vw_address, vw_varSize)
vw_m2 = _MEM(_OFFSET(vw_buf$), vw_varSize)

6
source/ide/ide_methods.bas
View file

@ -7296,7 +7296,7 @@ SUB DebugMode
END IF
CASE "global var", "local var"
tempIndex& = CVL(LEFT$(value$, 4))
address%& = VAL(MID$(value$, 5))
address%& = _CV(_OFFSET, MID$(value$, 5))
varType$ = usedVariableList(tempIndex&).varType
IF INSTR(varType$, "STRING *") THEN varType$ = "STRING"
SELECT CASE varType$
@ -7310,7 +7310,7 @@ SUB DebugMode
CASE "_OFFSET", "_UNSIGNED _OFFSET": varSize& = LEN(dummy%&)
CASE "STRING": varSize& = LEN(dummy%&) + LEN(dummy&)
END SELECT
cmd$ = "get address:" + MKL$(tempIndex&) + MKI$(1) + MKL$(varSize&) + STR$(address%&)
cmd$ = "get address:" + MKL$(tempIndex&) + MKI$(1) + MKL$(varSize&) + _MK$(_OFFSET, address%&)
GOSUB SendCommand
CASE "address read"
tempIndex& = CVL(LEFT$(value$, 4))
@ -7342,7 +7342,7 @@ SUB DebugMode
strLength& = CVL(MID$(recvData$, 5))
END IF
address$ = LEFT$(recvData$, LEN(dummy%&)) 'Pointer to data
cmd$ = "get address:" + MKL$(tempIndex&) + MKI$(2) + MKL$(strLength&) + STR$(address%&)
cmd$ = "get address:" + MKL$(tempIndex&) + MKI$(2) + MKL$(strLength&) + _MK$(_OFFSET, address%&)
GOSUB SendCommand
GOTO vwatch_string_seq1_done
END IF