YourWishes/jerryscript
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Increase the debugger version field size from 1 byte to 4 byte (#2513)

Browse Source 
JerryScript-DCO-1.0-Signed-off-by: Zoltan Herczeg zherczeg.u-szeged@partner.samsung.com
This commit is contained in:
Zoltan Herczeg
2018-09-20 09:33:56 +02:00
committed by László Langó
parent df69e1e08b
commit 35fbcd1ffd
3 changed files with 38 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jerry-debugger/jerry_client_ws.py
+16 -14
View File
@@ -24,7 +24,7 @@ import struct
import sys
# Expected debugger protocol version.
JERRY_DEBUGGER_VERSION = 5
JERRY_DEBUGGER_VERSION = 6
# Messages sent by the server to client.
JERRY_DEBUGGER_CONFIGURATION = 1
@@ -55,6 +55,9 @@ JERRY_DEBUGGER_WAIT_FOR_SOURCE = 25
JERRY_DEBUGGER_OUTPUT_RESULT = 26
JERRY_DEBUGGER_OUTPUT_RESULT_END = 27
# Debugger option flags
JERRY_DEBUGGER_LITTLE_ENDIAN = 0x1
# Subtypes of eval
JERRY_DEBUGGER_EVAL_EVAL = "\0"
JERRY_DEBUGGER_EVAL_THROW = "\1"
@@ -308,14 +311,14 @@ class JerryDebugger(object):
else:
result = b""
len_expected = 7
len_expected = 10
# Network configurations, which has the following struct:
# header [2] - opcode[1], size[1]
# type [1]
# configuration [1]
# version [4]
# max_message_size [1]
# cpointer_size [1]
# little_endian [1]
# version [1]
while len(result) < len_expected:
result += self.client_socket.recv(1024)
@@ -324,21 +327,15 @@ class JerryDebugger(object):
expected = struct.pack("BBB",
WEBSOCKET_BINARY_FRAME | WEBSOCKET_FIN_BIT,
5,
8,
JERRY_DEBUGGER_CONFIGURATION)
if result[0:3] != expected:
raise Exception("Unexpected configuration")
self.max_message_size = ord(result[3])
self.cp_size = ord(result[4])
self.little_endian = ord(result[5])
self.version = ord(result[6])
if self.version != JERRY_DEBUGGER_VERSION:
raise Exception("Incorrect debugger version from target: %d expected: %d" %
(self.version, JERRY_DEBUGGER_VERSION))
self.little_endian = ord(result[3]) & JERRY_DEBUGGER_LITTLE_ENDIAN
self.max_message_size = ord(result[8])
self.cp_size = ord(result[9])
if self.little_endian:
self.byte_order = "<"
@@ -354,6 +351,11 @@ class JerryDebugger(object):
self.idx_format = "I"
self.version = struct.unpack(self.byte_order + self.idx_format, result[4:8])[0]
if self.version != JERRY_DEBUGGER_VERSION:
raise Exception("Incorrect debugger version from target: %d expected: %d" %
(self.version, JERRY_DEBUGGER_VERSION))
logging.debug("Compressed pointer size: %d", self.cp_size)
if len_result > len_expected: