继续把 interp_execute.cc、interp_queue.cc、interp_find.cc 等 LinuxCNC 源文件纳入直接编译/链接路径,逐步删除临时 convert_g() wrapper 行为

结论:已将核心 LinuxCNC interpreter 源接入 standalone native 编译链接路径,移除 minimal runtime 中的手写 convert_g 行为,并通过 native probe 验证。
This commit is contained in:
2026-06-06 23:49:01 +08:00
commit 5025b0c1a1
95 changed files with 35453 additions and 0 deletions

View File

@@ -0,0 +1,4 @@
canon_event=COMMENT: Comment
canon_event=STRAIGHT_TRAVERSE line=1 x=1 y=2 z=0 a=0 b=0 c=0 u=0 v=0 w=0
canon_event=SET_FEED_RATE rate=120
canon_event=STRAIGHT_FEED line=2 x=3 y=4 z=0 a=0 b=0 c=0 u=0 v=0 w=0

View File

@@ -0,0 +1,5 @@
canon_event=STRAIGHT_TRAVERSE line=1 x=1 y=1 z=0 a=0 b=0 c=0 u=0 v=0 w=0
canon_event=SET_FEED_RATE rate=60
canon_event=STRAIGHT_FEED line=2 x=3 y=1 z=0 a=0 b=0 c=0 u=0 v=0 w=0
canon_event=STRAIGHT_FEED line=3 x=3 y=4 z=0 a=0 b=0 c=0 u=0 v=0 w=0
canon_event=STRAIGHT_TRAVERSE line=4 x=0 y=0 z=0 a=0 b=0 c=0 u=0 v=0 w=0

View File

@@ -0,0 +1,10 @@
canon_event=STRAIGHT_TRAVERSE line=1 x=1 y=2 z=3 a=0 b=0 c=0 u=0 v=0 w=0
canon_event=SET_FEED_RATE rate=80
canon_event=COMMENT: interpreter: distance mode changed to incremental
canon_event=STRAIGHT_FEED line=2 x=1.5 y=1 z=5 a=0 b=0 c=0 u=0 v=0 w=0
setup.current_x=1.5
setup.current_y=1
setup.current_z=5
setup.parameter_5420=1
setup.parameter_5421=2
setup.parameter_5422=3

View File

@@ -0,0 +1,9 @@
execute_line_1=5
error_text=Cannot do g1 with zero feed rate
setup.current_x=0
setup.current_y=0
setup.current_z=0
setup.parameter_5420=0
setup.parameter_5421=0
setup.parameter_5422=0
absent=canon_event=STRAIGHT_FEED

View File

@@ -0,0 +1,2 @@
G0 X1.0 Y2.0 (Comment)
G1 X3.0 Y4.0 F120.0

View File

@@ -0,0 +1,4 @@
G90 G0 X1.0 Y1.0
G91 G1 X2.0 F60.0
G1 Y3.0
G90 G0 X0.0 Y0.0

View File

@@ -0,0 +1,2 @@
G90 G0 X1.0 Y2.0 Z3.0
G91 G1 X0.5 Y-1.0 Z2.0 F80.0

View File

@@ -0,0 +1 @@
G1 X1.0

View File

@@ -0,0 +1,113 @@
#!/usr/bin/env bash
set -euo pipefail
ROOT_DIR="$(cd "$(dirname "$0")/../.." && pwd)"
BUILD_DIR="$ROOT_DIR/build/native"
GCODE_FIXTURE_DIR="$ROOT_DIR/tests/fixtures/gcode"
CANON_FIXTURE_DIR="$ROOT_DIR/tests/fixtures/canon"
GCODE_ERROR_FIXTURE_DIR="$ROOT_DIR/tests/fixtures/gcode_errors"
CANON_ERROR_FIXTURE_DIR="$ROOT_DIR/tests/fixtures/canon_errors"
"$ROOT_DIR/tools/build_native_probes.sh"
check_exitcode() {
local name="$1"
local file="$BUILD_DIR/$name.exitcode"
if [[ ! -f "$file" ]]; then
echo "missing exitcode: $file" >&2
exit 1
fi
local rc
rc="$(tr -d '[:space:]' < "$file")"
if [[ "$rc" != "0" ]]; then
echo "$name failed with exit code $rc" >&2
if [[ -f "$BUILD_DIR/$name.stderr.log" ]]; then
sed -n '1,160p' "$BUILD_DIR/$name.stderr.log" >&2
fi
exit 1
fi
}
check_exitcode linuxcnc_interp_state_probe
check_exitcode linuxcnc_namedparam_harness
check_exitcode linuxcnc_interp_minimal_harness
check_exitcode linuxcnc_interp_minimal_harness.run
check_exitcode linuxcnc_rs274_compile_probe
check_exitcode linuxcnc_interp_convert_source_probe
check_fixture_output() {
local fixture="$1"
local expected="$2"
local stdout_file="$3"
grep -Fq "read=0" "$stdout_file"
grep -Fq "parse_line=0" "$stdout_file"
local line_count
line_count="$(grep -cv '^[[:space:]]*$' "$fixture")"
local line_number
for ((line_number = 1; line_number <= line_count; line_number += 1)); do
grep -Fq "execute_line_${line_number}=0" "$stdout_file"
done
while IFS= read -r expected_event; do
[[ -z "$expected_event" ]] && continue
grep -Fq "$expected_event" "$stdout_file"
done < "$expected"
}
RUN_STDOUT="$BUILD_DIR/linuxcnc_interp_minimal_harness.run.stdout.log"
check_fixture_output \
"$GCODE_FIXTURE_DIR/minimal_linear.ngc" \
"$CANON_FIXTURE_DIR/minimal_linear.events" \
"$RUN_STDOUT"
for fixture in "$GCODE_FIXTURE_DIR"/*.ngc; do
name="$(basename "$fixture" .ngc)"
expected="$CANON_FIXTURE_DIR/$name.events"
if [[ ! -f "$expected" ]]; then
echo "missing expected canon fixture: $expected" >&2
exit 1
fi
stdout_file="$BUILD_DIR/linuxcnc_interp_minimal_harness.$name.stdout.log"
stderr_file="$BUILD_DIR/linuxcnc_interp_minimal_harness.$name.stderr.log"
"$BUILD_DIR/linuxcnc_interp_minimal_harness" "$fixture" \
>"$stdout_file" \
2>"$stderr_file"
check_fixture_output "$fixture" "$expected" "$stdout_file"
done
for fixture in "$GCODE_ERROR_FIXTURE_DIR"/*.ngc; do
name="$(basename "$fixture" .ngc)"
expected="$CANON_ERROR_FIXTURE_DIR/$name.expected"
if [[ ! -f "$expected" ]]; then
echo "missing expected error fixture: $expected" >&2
exit 1
fi
stdout_file="$BUILD_DIR/linuxcnc_interp_minimal_harness.$name.stdout.log"
stderr_file="$BUILD_DIR/linuxcnc_interp_minimal_harness.$name.stderr.log"
"$BUILD_DIR/linuxcnc_interp_minimal_harness" "$fixture" \
>"$stdout_file" \
2>"$stderr_file"
while IFS= read -r expected_line; do
[[ -z "$expected_line" ]] && continue
if [[ "$expected_line" == absent=* ]]; then
forbidden="${expected_line#absent=}"
if grep -Fq "$forbidden" "$stdout_file"; then
echo "unexpected output in $stdout_file: $forbidden" >&2
exit 1
fi
elif [[ "$expected_line" == error_text=* ]]; then
grep -Fq "${expected_line#error_text=}" "$stderr_file"
else
grep -Fq "$expected_line" "$stdout_file"
fi
done < "$expected"
done
echo "native probe validation complete"