ref: convert thordb to safe code, by grouping all globals into a single thor type

Author: panstromek

crates/enddev/src/enddev.rs

@@ -15,6 +15,7 @@ use libc_wrapper::{_IO_FILE, stdout, fprintf, fputs, printf, feof, fopen, sscanf
 use legacy_zebra::src::zebra::LibcTimeSource;
 use std::io::Write;
 use libc::isalnum;
+use legacy_zebra::src::thordb::LegacyThor;
 
 pub type C2RustUnnamed = u32;
 pub const _ISalnum: C2RustUnnamed = 8;
@@ -134,6 +135,7 @@ unsafe fn main_0(mut argc: i32, mut argv: *mut *mut i8)
     last_was_pass = 0;
     restart = 1;
     in_branch = 0;
+    let mut thor = LegacyThor::new();
     loop  {
         if restart != 0 {
             if in_branch != 0 {
@@ -196,7 +198,7 @@ unsafe fn main_0(mut argc: i32, mut argv: *mut *mut i8)
                                         0, 0,
                                         8, 60,
                                         60, 1,
-                                        &mut ev_info, g_state) as i32
+                                        &mut ev_info, g_state, &mut thor) as i32
             } else {
                 move_0 = game_moves[g_state.moves.disks_played as usize];
                 if g_state.moves.disks_played >= first_allowed_dev &&
@@ -221,7 +223,7 @@ unsafe fn main_0(mut argc: i32, mut argv: *mut *mut i8)
                     let evaluated_list = extended_compute_move::<LibcFatalError>(side_to_move, 0,
                                                                                  0, 8,
                                                                                  60,
-                                                                                 60, g_state.config.echo, g_state);
+                                                                                 60, g_state.config.echo, g_state, &mut thor);
                     assert_eq!(evaluated_list.get_evaluated_count(), g_state.moves.move_count[g_state.moves.disks_played as usize]);
                     best_score = -(12345678);
                     i_0 = 0;

crates/engine/src/game.rs

@@ -164,7 +164,7 @@ pub fn extended_compute_move<L: ComputeMoveLogger, Out: ComputeMoveOutput, FE: F
                                            mut mid: i32,
                                            mut exact: i32,
                                            mut wld: i32, mut echo: i32, g_state: &mut FullState,
-                                           update_cb: fn(&EvaluatedList), mut should_stop: StopFn, thor: &Thor)
+                                           update_cb: fn(&EvaluatedList), mut should_stop: StopFn, thor: &mut Thor)
                                            -> EvaluatedList {
     let mut list = EvaluatedList::new();
     let mut i: i32 = 0;
@@ -882,7 +882,7 @@ pub fn generic_compute_move<L: ComputeMoveLogger, Out: ComputeMoveOutput, FE: Fr
                                                                                                logger: &mut Option<L>,
                                                                                                display_pv:i32,
                                                                                                echo:i32, g_state: &mut FullState,
-                                                                                               thor: &Thor
+                                                                                               thor: &mut Thor
 )
                                                                                                -> i8 {
     let mut book_eval_info = EvaluationType::new();
@@ -1302,7 +1302,7 @@ pub fn compute_move<L: ComputeMoveLogger, Out: ComputeMoveOutput, FE: FrontEnd,
     search_forced: i32,
     eval_info: &mut EvaluationType, display_pv:i32, echo:i32,
     g_state: &mut FullState,
-    thor: &Thor
+    thor: &mut Thor
 )
     -> i8 {
     return generic_compute_move::<L, Out, FE, Thor>(

crates/engine/src/thordb.rs

@@ -1,13 +1,15 @@
 use crate::src::myrandom::MyRandom;
+use crate::src::timer::Timer;
 
 pub trait ThorDatabase {
     fn get_thor_game_move(&self, index: i32, move_number: i32) -> i32;
-    fn database_search(&self, in_board: &[i32], side_to_move: i32);
+    fn database_search(&mut self, in_board: &[i32], side_to_move: i32);
     fn get_match_count(&self) -> i32;
     fn get_black_win_count(&self) -> i32;
     fn get_draw_count(&self) -> i32;
     fn get_white_win_count(&self) -> i32;
     fn get_black_median_score(&self) -> i32;
     fn get_black_average_score(&self) -> f64;
-    fn choose_thor_opening_move(&self, in_board: &[i32], side_to_move: i32, echo: i32, random: &mut MyRandom) -> i32;
+    fn choose_thor_opening_move(&mut self, in_board: &[i32], side_to_move: i32, echo: i32, random: &mut MyRandom) -> i32;
+    fn load_thor_files(&mut self, g_timer: &mut Timer);
 }

crates/engine/src/zebra.rs

@@ -164,7 +164,6 @@ pub trait ZebraFrontend {
     fn report_engine_override();
     fn before_get_move();
     fn report_book_randomness(slack_: f64);
-    fn load_thor_files(g_timer: &mut Timer);
     fn print_move_alternatives(side_to_move: i32, board_state: &mut BoardState, g_book: &mut Book);
 }
 
@@ -212,7 +211,7 @@ pub fn next_state<
     ComputeMoveOut: ComputeMoveOutput,
     FE: FrontEnd,
     Thor: ThorDatabase
->(play_state: &mut PlayGame<Source>, move_attempt: Option<MoveAttempt>, thor: &Thor) -> PlayGameState {
+>(play_state: &mut PlayGame<Source>, move_attempt: Option<MoveAttempt>, thor: &mut Thor) -> PlayGameState {
     play_state.state = match play_state.state {
         PlayGameState::Initial => {
             /* Decode the predefined move sequence */
@@ -244,7 +243,7 @@ pub fn next_state<
             reset_book_search(&mut play_state.g_state.g_book);
             set_deviation_value(play_state.g_state.config.low_thresh, play_state.g_state.config.high_thresh, play_state.g_state.config.dev_bonus, &mut play_state.g_state.g_book);
             if play_state.g_state.config.use_thor {
-                ZF::load_thor_files(&mut play_state.g_state.timer);
+                Thor::load_thor_files(thor, &mut play_state.g_state.timer);
             }
             let white_is_player = play_state.g_state.config.skill[0] == 0;
             let black_is_player = play_state.g_state.config.skill[2] == 0;

crates/legacy-zebra/src/game.rs

@@ -136,7 +136,7 @@ pub fn ponder_move<
                            _book: i32,
                            mid: i32,
                            exact: i32,
-                           wld: i32, display_pv: i32, mut echo:i32, g_state: &mut FullState, thor: &Thor) {
+                           wld: i32, display_pv: i32, mut echo:i32, g_state: &mut FullState, thor: &mut Thor) {
     type Rep = LibcFatalError;
 
     let mut eval_info =EvaluationType::new();
@@ -302,10 +302,12 @@ pub fn get_pv(destin: &mut [i8], g_state: &mut FullState) -> i32 {
     };
 }
 pub fn extended_compute_move<FE: FrontEnd>(
-    side_to_move: i32, book_only: i32, book: i32, mid: i32, exact: i32, wld: i32, echo: i32, g_state: &mut FullState)
+    side_to_move: i32, book_only: i32, book: i32, mid: i32, exact: i32, wld: i32, echo: i32, g_state: &mut FullState,
+    thor: &mut LegacyThor
+)
     -> EvaluatedList {
     engine::src::game::extended_compute_move::<LogFileHandler, LibcZebraOutput, FE, LegacyThor, _>(
-        side_to_move, book_only, book, mid, exact, wld, echo, g_state, |_| (), || false, &LegacyThor
+        side_to_move, book_only, book, mid, exact, wld, echo, g_state, |_| (), || false, thor
     )
 }
 /*
@@ -318,7 +320,7 @@ pub fn perform_extended_solve(side_to_move: i32,
                                                 actual_move: i8,
                                                 book: i32,
                                                 exact_solve:
-                                                    i32, g_state: &mut FullState) {
+                                                    i32, g_state: &mut FullState, thor: &mut LegacyThor) {
     let mut i: i32 = 0;
     let mut mid: i32 = 0;
     let mut wld: i32 = 0;
@@ -365,14 +367,14 @@ pub fn perform_extended_solve(side_to_move: i32,
                         0, book, mid - 1,
                         exact - 1, wld - 1,
                         1,
-                        &mut evaluated_list[0].eval, g_state);
+                        &mut evaluated_list[0].eval, g_state, thor);
     if evaluated_list[0].eval.type_0 as u32 == PASS_EVAL as i32 as u32 {
         /* Don't allow pass */
         legacy_compute_move(side_to_move, 0, 0,
                             0, 0, book,
                             mid - 1, exact - 1,
                             wld - 1, 1,
-                            &mut evaluated_list[0].eval, g_state);
+                            &mut evaluated_list[0].eval, g_state, thor);
         if evaluated_list[0].eval.type_0 as u32 == PASS_EVAL as i32 as u32 {
             /* Game has ended */
             disc_diff = disc_count(side_to_move, &(g_state.board).board) -
@@ -422,7 +424,7 @@ pub fn perform_extended_solve(side_to_move: i32,
        if it isn't ACTUAL_MOVE */
     best_move = legacy_compute_move(side_to_move, 0, 0,
                                     0, 0, book, mid, exact,
-                                    wld, 1, &mut evaluated_list[1].eval, g_state);
+                                    wld, 1, &mut evaluated_list[1].eval, g_state, thor);
     if force_return == 0 && best_move != actual_move {
         /* Move list will contain best move first and then the actual move */
         game_evaluated_count = 2;
@@ -467,7 +469,9 @@ pub fn legacy_compute_move(side_to_move: i32,
                            exact: i32,
                            wld: i32,
                            search_forced: i32,
-                           eval_info: &mut EvaluationType, g_state: &mut FullState)
+                           eval_info: &mut EvaluationType, g_state: &mut FullState,
+                           thor: &mut LegacyThor
+)
                            -> i8 {
     return generic_compute_move::<LogFileHandler, LibcZebraOutput, LibcFatalError, LegacyThor>(side_to_move, update_all, my_time,
                                                                                                my_incr, timed_depth,
@@ -477,7 +481,7 @@ pub fn legacy_compute_move(side_to_move: i32,
                                                                                                &mut LogFileHandler::create_log_file_if_needed(),
                                                                                                g_state.config.display_pv,
                                                                                                g_state.config.echo,
-                                                                                               g_state, &LegacyThor);
+                                                                                               g_state, thor);
 }
 
 pub struct LibcZebraOutput;