diff --git a/Include/internal/pycore_frame.h b/Include/internal/pycore_frame.h
index 856297aaea8ab4..daab78bda026ad 100644
--- a/Include/internal/pycore_frame.h
+++ b/Include/internal/pycore_frame.h
@@ -139,9 +139,9 @@ _PyFrame_GetLocalsArray(_PyInterpreterFrame *frame)
}
/* Fetches the stack pointer, and sets stacktop to -1.
- Having stacktop <= 0 ensures that invalid
- values are not visible to the cycle GC.
- We choose -1 rather than 0 to assist debugging. */
+ Having stacktop <= 0 ensures that invalid
+ values are not visible to the cycle GC.
+ We choose -1 rather than 0 to assist debugging. */
static inline PyObject**
_PyFrame_GetStackPointer(_PyInterpreterFrame *frame)
{
diff --git a/Python/instrumentation.c b/Python/instrumentation.c
index 39a7eaa3bd2d42..bebd7b2cf3e4a5 100644
--- a/Python/instrumentation.c
+++ b/Python/instrumentation.c
@@ -111,13 +111,17 @@ static const uint8_t INSTRUMENTED_OPCODES[256] = {
};
static inline bool
-opcode_has_event(int opcode) {
- return opcode < INSTRUMENTED_LINE &&
- INSTRUMENTED_OPCODES[opcode] > 0;
+opcode_has_event(int opcode)
+{
+ return (
+ opcode < INSTRUMENTED_LINE &&
+ INSTRUMENTED_OPCODES[opcode] > 0
+ );
}
static inline bool
-is_instrumented(int opcode) {
+is_instrumented(int opcode)
+{
assert(opcode != 0);
assert(opcode != RESERVED);
return opcode >= MIN_INSTRUMENTED_OPCODE;
@@ -333,7 +337,8 @@ dump_monitors(const char *prefix, _Py_Monitors monitors, FILE*out)
/* Like _Py_GetBaseOpcode but without asserts.
* Does its best to give the right answer, but won't abort
* if something is wrong */
-int get_base_opcode_best_attempt(PyCodeObject *code, int offset)
+static int
+get_base_opcode_best_attempt(PyCodeObject *code, int offset)
{
int opcode = _Py_OPCODE(_PyCode_CODE(code)[offset]);
if (INSTRUMENTED_OPCODES[opcode] != opcode) {
@@ -412,13 +417,15 @@ dump_instrumentation_data(PyCodeObject *code, int star, FILE*out)
assert(test); \
} while (0)
-bool valid_opcode(int opcode) {
+static bool
+valid_opcode(int opcode)
+{
if (opcode > 0 &&
opcode != RESERVED &&
opcode < 255 &&
_PyOpcode_OpName[opcode] &&
- _PyOpcode_OpName[opcode][0] != '<'
- ) {
+ _PyOpcode_OpName[opcode][0] != '<')
+ {
return true;
}
return false;
@@ -544,11 +551,11 @@ de_instrument(PyCodeObject *code, int i, int event)
opcode_ptr = &code->_co_monitoring->lines[i].original_opcode;
opcode = *opcode_ptr;
}
- if (opcode == INSTRUMENTED_INSTRUCTION) {
+ if (opcode == INSTRUMENTED_INSTRUCTION) {
opcode_ptr = &code->_co_monitoring->per_instruction_opcodes[i];
opcode = *opcode_ptr;
}
- int deinstrumented = DE_INSTRUMENT[opcode];
+ int deinstrumented = DE_INSTRUMENT[opcode];
if (deinstrumented == 0) {
return;
}
@@ -775,8 +782,7 @@ add_line_tools(PyCodeObject * code, int offset, int tools)
{
assert(tools_is_subset_for_event(code, PY_MONITORING_EVENT_LINE, tools));
assert(code->_co_monitoring);
- if (code->_co_monitoring->line_tools
- ) {
+ if (code->_co_monitoring->line_tools) {
code->_co_monitoring->line_tools[offset] |= tools;
}
else {
@@ -792,8 +798,7 @@ add_per_instruction_tools(PyCodeObject * code, int offset, int tools)
{
assert(tools_is_subset_for_event(code, PY_MONITORING_EVENT_INSTRUCTION, tools));
assert(code->_co_monitoring);
- if (code->_co_monitoring->per_instruction_tools
- ) {
+ if (code->_co_monitoring->per_instruction_tools) {
code->_co_monitoring->per_instruction_tools[offset] |= tools;
}
else {
@@ -808,11 +813,10 @@ static void
remove_per_instruction_tools(PyCodeObject * code, int offset, int tools)
{
assert(code->_co_monitoring);
- if (code->_co_monitoring->per_instruction_tools)
- {
+ if (code->_co_monitoring->per_instruction_tools) {
uint8_t *toolsptr = &code->_co_monitoring->per_instruction_tools[offset];
*toolsptr &= ~tools;
- if (*toolsptr == 0 ) {
+ if (*toolsptr == 0) {
de_instrument_per_instruction(code, offset);
}
}
@@ -837,7 +841,7 @@ call_one_instrument(
assert(tstate->tracing == 0);
PyObject *instrument = interp->monitoring_callables[tool][event];
if (instrument == NULL) {
- return 0;
+ return 0;
}
int old_what = tstate->what_event;
tstate->what_event = event;
@@ -859,16 +863,15 @@ static const int8_t MOST_SIGNIFICANT_BITS[16] = {
3, 3, 3, 3,
};
-/* We could use _Py_bit_length here, but that is designed for larger (32/64) bit ints,
- and can perform relatively poorly on platforms without the necessary intrinsics. */
+/* We could use _Py_bit_length here, but that is designed for larger (32/64)
+ * bit ints, and can perform relatively poorly on platforms without the
+ * necessary intrinsics. */
static inline int most_significant_bit(uint8_t bits) {
assert(bits != 0);
if (bits > 15) {
return MOST_SIGNIFICANT_BITS[bits>>4]+4;
}
- else {
- return MOST_SIGNIFICANT_BITS[bits];
- }
+ return MOST_SIGNIFICANT_BITS[bits];
}
static bool
@@ -996,8 +999,8 @@ _Py_call_instrumentation_2args(
int
_Py_call_instrumentation_jump(
PyThreadState *tstate, int event,
- _PyInterpreterFrame *frame, _Py_CODEUNIT *instr, _Py_CODEUNIT *target
-) {
+ _PyInterpreterFrame *frame, _Py_CODEUNIT *instr, _Py_CODEUNIT *target)
+{
assert(event == PY_MONITORING_EVENT_JUMP ||
event == PY_MONITORING_EVENT_BRANCH);
assert(frame->prev_instr == instr);
@@ -1303,8 +1306,8 @@ initialize_line_tools(PyCodeObject *code, _Py_Monitors *all_events)
}
}
-static
-int allocate_instrumentation_data(PyCodeObject *code)
+static int
+allocate_instrumentation_data(PyCodeObject *code)
{
if (code->_co_monitoring == NULL) {
@@ -1398,7 +1401,7 @@ static const uint8_t super_instructions[256] = {
/* Should use instruction metadata for this */
static bool
-is_super_instruction(int opcode) {
+is_super_instruction(uint8_t opcode) {
return super_instructions[opcode] != 0;
}
@@ -1510,7 +1513,7 @@ _Py_Instrument(PyCodeObject *code, PyInterpreterState *interp)
#define C_RETURN_EVENTS \
((1 << PY_MONITORING_EVENT_C_RETURN) | \
- (1 << PY_MONITORING_EVENT_C_RAISE))
+ (1 << PY_MONITORING_EVENT_C_RAISE))
#define C_CALL_EVENTS \
(C_RETURN_EVENTS | (1 << PY_MONITORING_EVENT_CALL))
@@ -1555,8 +1558,8 @@ static int
check_tool(PyInterpreterState *interp, int tool_id)
{
if (tool_id < PY_MONITORING_SYS_PROFILE_ID &&
- interp->monitoring_tool_names[tool_id] == NULL
- ) {
+ interp->monitoring_tool_names[tool_id] == NULL)
+ {
PyErr_Format(PyExc_ValueError, "tool %d is not in use", tool_id);
return -1;
}
diff --git a/Python/pystate.c b/Python/pystate.c
index 1e04887ef04a2c..570d9d406afc05 100644
--- a/Python/pystate.c
+++ b/Python/pystate.c
@@ -649,11 +649,11 @@ init_interpreter(PyInterpreterState *interp,
_PyGC_InitState(&interp->gc);
PyConfig_InitPythonConfig(&interp->config);
_PyType_InitCache(interp);
- for(int i = 0; i < PY_MONITORING_UNGROUPED_EVENTS; i++) {
+ for (int i = 0; i < PY_MONITORING_UNGROUPED_EVENTS; i++) {
interp->monitors.tools[i] = 0;
}
for (int t = 0; t < PY_MONITORING_TOOL_IDS; t++) {
- for(int e = 0; e < PY_MONITORING_EVENTS; e++) {
+ for (int e = 0; e < PY_MONITORING_EVENTS; e++) {
interp->monitoring_callables[t][e] = NULL;
}
@@ -797,11 +797,11 @@ interpreter_clear(PyInterpreterState *interp, PyThreadState *tstate)
Py_CLEAR(interp->audit_hooks);
- for(int i = 0; i < PY_MONITORING_UNGROUPED_EVENTS; i++) {
+ for (int i = 0; i < PY_MONITORING_UNGROUPED_EVENTS; i++) {
interp->monitors.tools[i] = 0;
}
for (int t = 0; t < PY_MONITORING_TOOL_IDS; t++) {
- for(int e = 0; e < PY_MONITORING_EVENTS; e++) {
+ for (int e = 0; e < PY_MONITORING_EVENTS; e++) {
Py_CLEAR(interp->monitoring_callables[t][e]);
}
}
diff --git a/Python/specialize.c b/Python/specialize.c
index 3fa28f409892dc..b8662810181c15 100644
--- a/Python/specialize.c
+++ b/Python/specialize.c
@@ -147,7 +147,7 @@ print_spec_stats(FILE *out, OpcodeStats *stats)
PRIu64 "\n", i, j, val);
}
}
- for(int j = 0; j < 256; j++) {
+ for (int j = 0; j < 256; j++) {
if (stats[i].pair_count[j]) {
fprintf(out, "opcode[%d].pair_count[%d] : %" PRIu64 "\n",
i, j, stats[i].pair_count[j]);
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy